diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-05-28 20:47:27 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-29 00:17:34 +0800 |
| commit | 3f395fce0fe950a5fb6959f01469e512ce81f377 (patch) | |
| tree | 1c5f7e8e2bb63a56f6f7999e273ec098d4df9dae /e-util/gconf-bridge.c | |
| parent | 71db41ef693bb3444cb9b459ef73fb5bdb0d4764 (diff) | |
| download | gsoc2013-evolution-3f395fce0fe950a5fb6959f01469e512ce81f377.tar gsoc2013-evolution-3f395fce0fe950a5fb6959f01469e512ce81f377.tar.gz gsoc2013-evolution-3f395fce0fe950a5fb6959f01469e512ce81f377.tar.bz2 gsoc2013-evolution-3f395fce0fe950a5fb6959f01469e512ce81f377.tar.lz gsoc2013-evolution-3f395fce0fe950a5fb6959f01469e512ce81f377.tar.xz gsoc2013-evolution-3f395fce0fe950a5fb6959f01469e512ce81f377.tar.zst gsoc2013-evolution-3f395fce0fe950a5fb6959f01469e512ce81f377.zip | |
Bug #535516 - Crash in GConf Bridge while replying
A test patch, maybe not fixing the bug fully, but let's try it.
Diffstat (limited to 'e-util/gconf-bridge.c')
| -rw-r--r-- | e-util/gconf-bridge.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c index 060c26ccc7..9630bbf916 100644 --- a/e-util/gconf-bridge.c +++ b/e-util/gconf-bridge.c @@ -649,16 +649,16 @@ window_binding_configure_event_cb (GtkWindow *window, GdkEventConfigure *event, WindowBinding *binding) { - /* Schedule a sync */ - if (binding->sync_timeout_id == 0) { - binding->sync_timeout_id = - g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY, - (GSourceFunc) - window_binding_perform_scheduled_sync, - binding); - } + /* re-postpone by cancel of the previous request */ + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); - return FALSE; + /* Schedule a sync */ + binding->sync_timeout_id = g_timeout_add_seconds (WINDOW_BINDING_SYNC_DELAY, + (GSourceFunc) window_binding_perform_scheduled_sync, + binding); + + return FALSE; } /* Called when the window state is being changed */ @@ -667,6 +667,9 @@ window_binding_state_event_cb (GtkWindow *window, GdkEventWindowState *event, WindowBinding *binding) { + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); + window_binding_perform_scheduled_sync (binding); return FALSE; @@ -697,6 +700,9 @@ window_binding_window_destroyed (gpointer user_data, binding->window = NULL; /* Don't do anything with the window at unbind() */ + if (binding->sync_timeout_id > 0) + g_source_remove (binding->sync_timeout_id); + g_hash_table_remove (bridge->bindings, GUINT_TO_POINTER (binding->id)); } |