aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-12-09 20:40:27 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-12-09 20:40:27 +0800
commit6c11c5f47122be1f04e8c6fd72881693d277de4e (patch)
tree4f85ba2a7545d1ab02d3f2c7189f940fdca1374f
parentbbf8018ca5f36a8cec1736c4ac148829ad19ef86 (diff)
downloadgsoc2013-evolution-6c11c5f47122be1f04e8c6fd72881693d277de4e.tar
gsoc2013-evolution-6c11c5f47122be1f04e8c6fd72881693d277de4e.tar.gz
gsoc2013-evolution-6c11c5f47122be1f04e8c6fd72881693d277de4e.tar.bz2
gsoc2013-evolution-6c11c5f47122be1f04e8c6fd72881693d277de4e.tar.lz
gsoc2013-evolution-6c11c5f47122be1f04e8c6fd72881693d277de4e.tar.xz
gsoc2013-evolution-6c11c5f47122be1f04e8c6fd72881693d277de4e.tar.zst
gsoc2013-evolution-6c11c5f47122be1f04e8c6fd72881693d277de4e.zip
** Fix for bug #555663
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. svn path=/branches/gnome-2-24/; revision=36854
-rw-r--r--e-util/ChangeLog7
-rw-r--r--e-util/gconf-bridge.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 97a2b35853..83675dc4f5 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2008-11-27 Milan Crha <mcrha@redhat.com>
** Fix for bug #332729
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 5135eb1d30..451b7052cb 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -70,6 +70,7 @@ typedef struct {
GtkWindow *window;
gulong configure_event_id;
+ gulong window_state_event_id;
gulong unmap_id;
guint sync_timeout_id;
} WindowBinding;
@@ -819,7 +820,7 @@ gconf_bridge_bind_window (GConfBridge *bridge,
(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 @@ window_binding_unbind (WindowBinding *binding)
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),