[gnome-applet-netspeed] * Wed Aug 11 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.16-4 - Correctly disconnect ico

[Michael Schwendt]

commit fd14b33d0215106a4e74b86a10ca425262f2e626
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Aug 11 13:11:03 2010 +0200

    * Wed Aug 11 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.16-4
    - Correctly disconnect icon_theme_changed_cb (from upstream bz 600597).

 gnome-applet-netspeed.spec                         |   13 +++++++++----
 ...applet-0.16-disconnect-icon-theme-changed.patch |   12 ++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/gnome-applet-netspeed.spec b/gnome-applet-netspeed.spec
index 6d1ef97..b89b422 100644
--- a/gnome-applet-netspeed.spec
+++ b/gnome-applet-netspeed.spec
@@ -1,6 +1,6 @@
 Name:           gnome-applet-netspeed    
 Version:        0.16
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME applet that shows traffic on a network device
 
 Group:          Applications/Internet
@@ -23,10 +23,11 @@ Requires(postun): scrollkeeper
 # reported in GNOME bz 622984
 Patch0: netspeed_applet-0.16-gnome-icon-theme-2.30.patch
 # related to GNOME bz 600579 / Fedora #530920
-# if a next upstream release includes the "any_signal::changed" fix,
-# this work-around may be deleted
 Patch1: netspeed_applet-0.16-copy-qualpixbufs.patch
-
+# related to GNOME bz 600579
+# g_signal_handler_is_connected says that the patch is good, but
+# is it sufficient to fix bz 600597?
+Patch2: netspeed_applet-0.16-disconnect-icon-theme-changed.patch
 
 %description
 netspeed is a little GNOME applet that shows the traffic on a
@@ -38,6 +39,7 @@ specified network device (for example eth0) in kbytes/s.
 %patch0 -p1 -b .gnome-icon-theme-2.30
 %endif
 %patch1 -p1 -b .copy-qualpixbufs
+%patch2 -p1 -b .disconnect-icon-theme-changed
 
 
 %build
@@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 11 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.16-4
+- Correctly disconnect icon_theme_changed_cb (from upstream bz 600597).
+
 * Thu Jul 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.16-3
 - Use copies of the wireless-quality icons (related to #530920).
 
diff --git a/netspeed_applet-0.16-disconnect-icon-theme-changed.patch b/netspeed_applet-0.16-disconnect-icon-theme-changed.patch
new file mode 100644
index 0000000..7e0cf66
--- /dev/null
+++ b/netspeed_applet-0.16-disconnect-icon-theme-changed.patch
@@ -0,0 +1,12 @@
+diff -Nur netspeed_applet-0.16-orig/src/netspeed.c netspeed_applet-0.16/src/netspeed.c
+--- netspeed_applet-0.16-orig/src/netspeed.c	2010-06-05 16:02:11.000000000 +0200
++++ netspeed_applet-0.16/src/netspeed.c	2010-08-11 12:52:01.000000000 +0200
+@@ -1421,7 +1421,7 @@
+ 	g_assert(applet);
+ 	
+ 	icon_theme = gtk_icon_theme_get_default();
+-	g_object_disconnect(G_OBJECT(icon_theme), "changed",
++	g_object_disconnect(G_OBJECT(icon_theme), "any_signal::changed",
+ 			G_CALLBACK(icon_theme_changed_cb), (gpointer)applet,
+ 			NULL);
+ 	g_source_remove(applet->timeout_id);