- obsolete

Changed files:
    rhythmbox-broken_locale.patch -> 1.6
    rhythmbox-use-icon-name.patch -> 1.5

diff --git a/rhythmbox-broken_locale.patch b/rhythmbox-broken_locale.patch
deleted file mode 100644 (file)
index 109cec4..0000000
--- a/rhythmbox-broken_locale.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -aurN rhythmbox-0.9.4.90.orig/po/LINGUAS rhythmbox-0.9.4.90/po/LINGUAS
---- rhythmbox-0.9.4.90.orig/po/LINGUAS 2006-04-18 10:04:43.000000000 +0200
-+++ rhythmbox-0.9.4.90/po/LINGUAS      2006-06-15 12:39:40.332856912 +0200
-@@ -2,4 +2,4 @@
- #
- # please keep this list sorted alphabetically
- #
--am ar az be bg ca cs cy da de el en_CA en_GB es et eu fi fr ga gl he hr hu id is it ja ko lt lv mk ml mn ms nb ne nl pa pl pt pt_BR ro ru rw sk sr sr@Latn sv th tr uk vi zh_CN zh_HK zh_TW 
-+am az be bg ca cs cy da de el en_CA en_GB es et eu fi fr ga gl he hr hu id is it ja ko lt lv mk ml ms nb ne nl pa pl pt pt_BR ro ru rw sk sr sr@Latn sv th tr uk vi zh_CN zh_HK zh_TW

diff --git a/rhythmbox-use-icon-name.patch b/rhythmbox-use-icon-name.patch
deleted file mode 100644 (file)
index 3f1fda4..0000000
--- a/rhythmbox-use-icon-name.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aurN rhythmbox-0.9.4.90.orig/widgets/eggtrayicon.c rhythmbox-0.9.4.90/widgets/eggtrayicon.c
---- rhythmbox-0.9.4.90.orig/widgets/eggtrayicon.c      2006-05-19 10:43:54.000000000 +0200
-+++ rhythmbox-0.9.4.90/widgets/eggtrayicon.c   2006-06-15 12:48:33.706771752 +0200
-@@ -548,39 +548,35 @@
-     {
-       secondary = "";
-     }
--
-+  
-+  pixbuf = NULL;
-+  
-   esc_primary = g_markup_escape_text (primary, strlen (primary));
-   esc_secondary = g_markup_escape_text (secondary, strlen (secondary));
--  icon->notify->handle = notify_notification_new (esc_primary,
--                                                  esc_secondary,
--                                                  NULL,
--                                                  GTK_WIDGET (icon));
--  g_free (esc_primary);
--  g_free (esc_secondary);
--
--  notify_notification_set_timeout (icon->notify->handle, timeout);
- 
-   if (msgicon)
-     {
-+      icon->notify->handle = notify_notification_new (esc_primary,
-+                                                      esc_secondary,
-+                                                      NULL,
-+                                                      GTK_WIDGET (icon));
-       pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (msgicon));
-     }
-   else
-     {
--      GtkIconTheme *theme;
--      gint icon_size;
--
--      theme = gtk_icon_theme_get_default ();
--      gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &icon_size, NULL);
--      pixbuf = gtk_icon_theme_load_icon (theme,
--                                         "gnome-media-player",
--                                         icon_size,
--                                         0,
--                                         NULL);
-+      icon->notify->handle = notify_notification_new (esc_primary,
-+                                                      esc_secondary,
-+                                                      "gnome-media-player",
-+                                                      GTK_WIDGET (icon));
-     }
--
-+    
-+  notify_notification_set_timeout (icon->notify->handle, timeout);
-+  g_free (esc_primary);
-+  g_free (esc_secondary);
-+  
-   if (pixbuf)
-     {
--#if (LIBNOTIFY_VERSION_MAJOR == 0 && LIBNOTIFY_VERSION_MINOR <=3 && LIBNOTIFY_VERSION_MICRO < 2)
-+#if (LIBNOTIFY_VERSION_MICRO < 2) && (LIBNOTIFY_VERSION_MINOR < 4)
-       notify_notification_set_icon_data_from_pixbuf (icon->notify->handle, pixbuf);
- #else
-       notify_notification_set_icon_from_pixbuf (icon->notify->handle, pixbuf);