close the editor here in case of save and discard so that callers need not

2005-02-19  Sivaiah Nallagatla <snallagatla@novell.com>

       * 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

1 files changed, 7 insertions, 2 deletions

diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index 4f535e47c8..278f8a4c3f 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -250,7 +250,11 @@ eab_editor_get_window (EABEditor *editor)
 	else
 		return NULL;
 }
-
+/* This function prompts for saving if editor conents are in changed state and
+   save or discards or cancels(just returns with out doing anything) according to user input. 
+   Editor gets destoryed in case of save and discard case. 
+   */
+   
 gboolean
 eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window)
 {
@@ -262,9 +266,10 @@ eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window)
 		if (!eab_editor_is_valid (editor)) {
 			return FALSE;
 		}
-		eab_editor_save_contact (editor, FALSE);
+		eab_editor_save_contact (editor, TRUE);
 		return TRUE;
 	case GTK_RESPONSE_NO:
+		eab_editor_close (EAB_EDITOR (editor));
 		return TRUE;
 	case GTK_RESPONSE_CANCEL:
 	default: