Merge lp:~speakman/ubuntu/natty/padevchooser/drop-use_stock_gnome_icons.patch into lp:ubuntu/natty/padevchooser

[Daniel Nyström]

Get icons back to padevchooser. Although they doesn't match Ubuntu default theme, there are at least some.

(Sorry for re-requesting - wrong commit email in previous version)

[Martin Pitt (pitti)]

Closing, see bug report. Thanks!

review: Disapprove

Unmerged revisions

8. By Daniel Nyström on 2011-04-28

Drop use_stock_gnome_icons.patch. Fixes (LP: #632468)

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-16 18:36:50 +0000
+++ debian/changelog	2011-04-28 20:59:53 +0000
@@ -1,3 +1,9 @@
+padevchooser (0.9.3-2ubuntu5) natty; urgency=low
+
+  * Drop use_stock_gnome_icons.patch. Fixes (LP: #632468)
+
+ -- Daniel Nyström <[e-mail]>  Thu, 28 Apr 2011 22:22:05 +0200
+
 padevchooser (0.9.3-2ubuntu4) jaunty; urgency=low
 
   * lp147305.patch: Don't crash when zeroconf devices disappear
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2009-04-16 18:36:50 +0000
+++ debian/patches/series	2011-04-28 20:59:53 +0000
@@ -1,5 +1,4 @@
 # This series applies on GIT commit 42cd6a27e16cacb8b33efd4105497c864ce4e8ff
 statustray_svn24.patch
-use_stock_gnome_icons.patch
 desktop_hig_comment.patch
 lp147305.patch
 
=== removed file 'debian/patches/use_stock_gnome_icons.patch'
--- debian/patches/use_stock_gnome_icons.patch	2008-03-21 14:31:04 +0000
+++ debian/patches/use_stock_gnome_icons.patch	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-Use stock Gnome icons (instead of Tango icons)
-
-From: CJ van den Berg <[e-mail]>
-
-
----
-
- src/padevchooser.c       |   14 +++++++-------
- src/padevchooser.desktop |    2 +-
- src/padevchooser.glade   |    2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-Index: padevchooser-0.9.3/src/padevchooser.c
-===================================================================
---- padevchooser-0.9.3.orig/src/padevchooser.c	2008-03-21 15:13:46.000000000 -0500
-+++ padevchooser-0.9.3/src/padevchooser.c	2008-03-21 15:14:49.000000000 -0500
-@@ -162,13 +162,13 @@
-         
-     if (!notification) {
-         s = g_strdup_printf("<i>%s</i>\n%s", title, text);
--        notification = notify_notification_new(title, s, "audio-card", GTK_WIDGET(tray_icon));
-+        notification = notify_notification_new(title, s, "stock_line_in", GTK_WIDGET(tray_icon));
-         notify_notification_set_category(notification, "device.added");
-         notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW);
-         g_signal_connect_swapped(G_OBJECT(notification), "closed", G_CALLBACK(notification_closed), NULL);
-     } else {
-         s = g_strdup_printf("%s\n\n<i>%s</i>\n%s", last_events, title, text);
--        notify_notification_update(notification, title, s, "audio-card");
-+        notify_notification_update(notification, title, s, "stock_line_in");
-     }
-     
-     g_free(last_events);
-@@ -525,7 +525,7 @@
-     tray_icon = gtk_status_icon_new();
-     
-     g_signal_connect_object(G_OBJECT(tray_icon), "activate", G_CALLBACK(tray_icon_on_click), tray_icon, 0);
--    gtk_status_icon_set_from_icon_name(tray_icon, "audio-card");
-+    gtk_status_icon_set_from_icon_name(tray_icon, "stock_line_in");
-     gtk_status_icon_set_tooltip(tray_icon, "PulseAudio Applet");
-     gtk_status_icon_set_visible(tray_icon, TRUE);
- 
-@@ -583,9 +583,9 @@
-     append_default_device_menu_items(source_submenu, &no_sources_menu_item, &default_source_menu_item, &other_source_menu_item, source_default_cb, source_other_cb);
-     append_default_device_menu_items(server_submenu, &no_servers_menu_item, &default_server_menu_item, &other_server_menu_item, server_default_cb, server_other_cb);
- 
--    append_submenu(menu, "Default S_erver", server_submenu, "network-wired");
--    append_submenu(menu, "Default S_ink", sink_submenu, "audio-card");
--    append_submenu(menu, "Default S_ource", source_submenu, "audio-input-microphone");
-+    append_submenu(menu, "Default S_erver", server_submenu, "gnome-dev-ethernet");
-+    append_submenu(menu, "Default S_ink", sink_submenu, "stock_headphones");
-+    append_submenu(menu, "Default S_ource", source_submenu, "stock_mic");
-     gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
-     
-     item = append_menuitem(menu, "_Manager...", NULL);
-@@ -593,7 +593,7 @@
-     g_free(c);
-     g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(start_manager_cb), NULL);
-     
--    item = append_menuitem(menu, "_Volume Control...", "multimedia-volume-control");
-+    item = append_menuitem(menu, "_Volume Control...", "stock_volume");
-     gtk_widget_set_sensitive(item, !!(c = g_find_program_in_path("pavucontrol")));
-     g_free(c);
-     g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(start_vucontrol_cb), NULL);
-Index: padevchooser-0.9.3/src/padevchooser.desktop
-===================================================================
---- padevchooser-0.9.3.orig/src/padevchooser.desktop	2008-03-21 15:12:36.000000000 -0500
-+++ padevchooser-0.9.3/src/padevchooser.desktop	2008-03-21 15:13:48.000000000 -0500
-@@ -5,7 +5,7 @@
- GenericName=Device Chooser
- Comment=An Applet for Quick Device Changing
- Exec=padevchooser
--Icon=audio-card
-+Icon=stock_line_in
- StartupNotify=true
- Type=Application
- Categories=Application;AudioVideo;Audio;
-Index: padevchooser-0.9.3/src/padevchooser.glade
-===================================================================
---- padevchooser-0.9.3.orig/src/padevchooser.glade	2008-03-21 15:12:36.000000000 -0500
-+++ padevchooser-0.9.3/src/padevchooser.glade	2008-03-21 15:13:48.000000000 -0500
-@@ -76,7 +76,7 @@
- 		    <widget class="GtkImage" id="image1">
- 		      <property name="visible">True</property>
- 		      <property name="icon_size">6</property>
--		      <property name="icon_name">audio-card</property>
-+		      <property name="icon_name">stock_sound</property>
- 		      <property name="xalign">0.5</property>
- 		      <property name="yalign">0.5</property>
- 		      <property name="xpad">0</property>