aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/contact-editor/eab-editor.c
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui/contact-editor/eab-editor.c')
-rw-r--r--addressbook/gui/contact-editor/eab-editor.c11
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);
}