diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 13 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-view.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-editor.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-model.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5d94b4a3d0..ac2441a9e3 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,18 @@ 2008-09-23 Milan Crha <mcrha@redhat.com> + ** Part of fix for bug #553273 + + * gui/component/addressbook-view.c: (delete_addressbook_folder), + (delete_addressbook_cb): + * gui/widgets/eab-gui-util.c: (save_it): + * gui/contact-list-editor/e-contact-list-model.c: + (e_contact_list_model_add_email): + * gui/contact-list-editor/e-contact-list-editor.c: + (contact_list_editor_contact_exists): + Always end e_error_run/e_error_new calls with NULL parameter. + +2008-09-23 Milan Crha <mcrha@redhat.com> + ** Fix for bug #552575 * gui/widgets/eab-gui-util.c: (eab_send_contact_list_as_attachment): diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index cc8f195c98..d89565027b 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -331,7 +331,7 @@ delete_addressbook_folder (AddressbookView *view) toplevel = (GtkWindow *) gtk_widget_get_toplevel (priv->notebook); if (e_error_run (toplevel, "addressbook:ask-delete-addressbook", - e_source_peek_name(selected_source)) != GTK_RESPONSE_YES) + e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES) return; /* Remove local data */ @@ -885,7 +885,7 @@ delete_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) toplevel = (GtkWindow *)gtk_widget_get_toplevel(ep->target->widget); - if (e_error_run(toplevel, "addressbook:ask-delete-addressbook", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES) + if (e_error_run (toplevel, "addressbook:ask-delete-addressbook", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES) return; /* Remove local data */ 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 d8a53566e8..8fec8b315d 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -261,7 +261,7 @@ contact_list_editor_contact_exists (EContactListModel *model, if (!e_contact_list_model_has_email (model, email)) return FALSE; - return (e_error_run (NULL, tag, email) != GTK_RESPONSE_YES); + return (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES); } static void diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index c91bfb44d5..f381e6754e 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -152,7 +152,7 @@ e_contact_list_model_add_email (EContactListModel *model, g_return_if_fail (email != NULL); if (e_contact_list_model_has_email (model, email)) - if (e_error_run (NULL, tag, email) != GTK_RESPONSE_YES) + if (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES) return; destination = e_destination_new (); diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index ac6f89c582..d6a6b3ca71 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -404,7 +404,7 @@ save_it(GtkWidget *widget, SaveAsInfo *info) * {0}, {1} and {2}, respectively in the error message formed */ e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error", - err_str_ext, filename, g_strerror (errno)); + err_str_ext, filename, g_strerror (errno), NULL); gtk_widget_destroy(GTK_WIDGET(info->filesel)); return; } |