From 956ec9c13e4da1954d6506fde84806954792f1c1 Mon Sep 17 00:00:00 2001 From: Sivaiah Nallagatla Date: Tue, 22 Feb 2005 00:58:15 +0000 Subject: close the editor here in case of save and discard so that callers need not 2005-02-19 Sivaiah Nallagatla * gui/contact-editor/eab-editor.c (eab_editor_prompt_to_save_changes) : close the editor here in case of save and discard so that callers need not worry about closing * gui/contact-list-editor/e-contact-list-editor.c (closed_cb) (app_delete_event_cb) : don't close the editor here as that is handled by _save_changes call. Also no need to check for return value of that function as it does not matter here. Fixes #70371 svn path=/trunk/; revision=28839 --- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'addressbook/gui/contact-list-editor/e-contact-list-editor.c') diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 7cbf1d8dff..c4a5acd170 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -470,10 +470,7 @@ e_contact_list_editor_get_window (EABEditor *editor) static void close_cb (GtkWidget *widget, EContactListEditor *cle) { - if (!eab_editor_prompt_to_save_changes (EAB_EDITOR (cle), GTK_WINDOW (cle->app))) - return; - - eab_editor_close (EAB_EDITOR (cle)); + eab_editor_prompt_to_save_changes (EAB_EDITOR (cle), GTK_WINDOW (cle->app)); } static void @@ -864,10 +861,7 @@ app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data) if (ce->in_async_call) return TRUE; - if (!eab_editor_prompt_to_save_changes (EAB_EDITOR (ce), GTK_WINDOW (ce->app))) - return TRUE; - - eab_editor_close (EAB_EDITOR (ce)); + eab_editor_prompt_to_save_changes (EAB_EDITOR (ce), GTK_WINDOW (ce->app)); return TRUE; } -- cgit v1.2.3