From 51d0fc6863be998af5056605281cc0ebc2abfe00 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Jun 2010 14:28:07 -0400 Subject: Bug 603468 - Improve handling of --quit option --- addressbook/gui/contact-editor/eab-editor.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/contact-editor/eab-editor.c') 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); } -- cgit v1.2.3