diff options
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 3 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/eab-editor.c | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 436be003d5..40c2a00aee 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,15 @@ +2006-01-25 Simon Zheng <simon.zheng@sun.com> + + ** Fixes #327203 + + * gui/contact-editor/e-contact-editor.c (app_delete_event_cb): + Checking the validity of contact editor should be done after + extracting all fields. This's done in save_contact(). + * gui/contact-editor/eab-editor.c + (eab_editor_prompt_to_save_changes): To avoid repeating free memory, + delete eab_editor_close(). In fact, eab_editor_save_contact() has + done it before. + 2006-01-23 Devashish Sharma <sdevashish@novell.com> * importers/evolution-csv-importer.c : Made some changes for solving some diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index fa945f702d..54831b0de6 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -3096,9 +3096,6 @@ app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data) if (ce->changed) { switch (eab_prompt_save_dialog (GTK_WINDOW (ce->app))) { case GTK_RESPONSE_YES: - if (!eab_editor_is_valid (EAB_EDITOR (ce))) - return TRUE; - eab_editor_save_contact (EAB_EDITOR (ce), TRUE); return TRUE; diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index 7c0efa0cca..31ed8a77b2 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -269,7 +269,6 @@ eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window) return FALSE; } eab_editor_save_contact (editor, TRUE); - eab_editor_close (EAB_EDITOR (editor)); return TRUE; case GTK_RESPONSE_NO: eab_editor_close (EAB_EDITOR (editor)); |