diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-13 02:28:07 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-13 02:28:07 +0800 |
| commit | 51d0fc6863be998af5056605281cc0ebc2abfe00 (patch) | |
| tree | ca9410d6729e2b3d989f0fbbc069c2563a634739 /addressbook/gui | |
| parent | 077116eac4cbfd5f06c44c8f5634469eab3130e6 (diff) | |
| download | gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar.gz gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar.bz2 gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar.lz gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar.xz gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.tar.zst gsoc2013-evolution-51d0fc6863be998af5056605281cc0ebc2abfe00.zip | |
Bug 603468 - Improve handling of --quit option
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/contact-editor/eab-editor.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index 17ac1c391c..f53ecc30cd 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -57,11 +57,16 @@ static gpointer parent_class; static guint signals[LAST_SIGNAL]; static void -eab_editor_quit_requested_cb (EABEditor *editor, - EShell *shell) +eab_editor_quit_requested_cb (EShell *shell, + EShellQuitReason reason, + EABEditor *editor) { GtkWindow *window; + /* Quit immediately if another Evolution process asked us to. */ + if (reason == E_SHELL_QUIT_REMOTE_REQUEST) + return; + window = eab_editor_get_window (editor); eab_editor_raise (editor); @@ -78,7 +83,7 @@ eab_editor_set_shell (EABEditor *editor, editor->priv->shell = g_object_ref (shell); - g_signal_connect_swapped ( + g_signal_connect ( shell, "quit-requested", G_CALLBACK (eab_editor_quit_requested_cb), editor); } |