evolution r36854 - branches/gnome-2-24/e-util

[mcrha svn gnome org]

Author: mcrha
Date: Tue Dec  9 12:40:27 2008
New Revision: 36854
URL: http://svn.gnome.org/viewvc/evolution?rev=36854&view=rev

Log:
2008-12-09  Milan Crha  <mcrha redhat com>

	** Fix for bug #555663

	* gconf-bridge.c: (struct WindowBinding), (gconf_bridge_bind_window),
	(window_binding_unbind): Do not overwrite signal id.



Modified:
   branches/gnome-2-24/e-util/ChangeLog
   branches/gnome-2-24/e-util/gconf-bridge.c

Modified: branches/gnome-2-24/e-util/gconf-bridge.c
==============================================================================
--- branches/gnome-2-24/e-util/gconf-bridge.c	(original)
+++ branches/gnome-2-24/e-util/gconf-bridge.c	Tue Dec  9 12:40:27 2008
@@ -70,6 +70,7 @@
 
         GtkWindow *window;
         gulong configure_event_id;
+	gulong window_state_event_id;
         gulong unmap_id;
         guint sync_timeout_id;
 } WindowBinding;
@@ -819,7 +820,7 @@
                                         (window_binding_configure_event_cb),
                                   binding);
 
-        binding->configure_event_id =
+        binding->window_state_event_id =
                 g_signal_connect (window,
                                   "window_state_event",
                                   G_CALLBACK
@@ -857,6 +858,8 @@
                 g_signal_handler_disconnect (binding->window,
                                              binding->configure_event_id);
                 g_signal_handler_disconnect (binding->window,
+					     binding->window_state_event_id);
+                g_signal_handler_disconnect (binding->window,
                                              binding->unmap_id);
 
                 g_object_weak_unref (G_OBJECT (binding->window),