aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/gconf-bridge.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-12-11 02:30:29 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-12-11 02:30:29 +0800
commitd158af8cdfa6e4bf85c1e74769e8d61bc469494c (patch)
treeba55b970ae3a23e5ade4edbddc4eb8dcaf3033bd /e-util/gconf-bridge.c
parentdc0d0ee010319425b19d8d8d493f0bc489d5fd07 (diff)
downloadgsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.gz
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.zst
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.zip
Merge revisions 36811:36865 from trunk.
svn path=/branches/kill-bonobo/; revision=36867
Diffstat (limited to 'e-util/gconf-bridge.c')
-rw-r--r--e-util/gconf-bridge.c5
1 files changed, 4 insertions, 1 deletions
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),