From dd797d23c8de2d4971ea395b59b239b13866e8e4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 23 Sep 2008 11:42:18 +0000 Subject: ** Fix for bug #553273 2008-09-23 Milan Crha ** Fix for bug #553273 * addressbook/gui/component/addressbook-view.c: (delete_addressbook_folder), (delete_addressbook_cb): * addressbook/gui/widgets/eab-gui-util.c: (save_it): * addressbook/gui/contact-list-editor/e-contact-list-model.c: (e_contact_list_model_add_email): * addressbook/gui/contact-list-editor/e-contact-list-editor.c: (contact_list_editor_contact_exists): * plugins/exchange-operations/exchange-config-listener.c: (exchange_config_listener_authenticate): * mail/em-composer-utils.c: (em_utils_handle_receipt): * mail/em-folder-view.c: (emfv_delete_msg_response): * composer/e-composer-actions.c: (action_save_cb): * calendar/gui/alarm-notify/alarm-queue.c: (edit_component): * calendar/gui/tasks-component.c: (delete_task_list_cb): * calendar/gui/calendar-component.c: (delete_calendar_cb): * calendar/gui/memos-component.c: (delete_memo_list_cb): Always end e_error_run/e_error_new calls with NULL parameter. svn path=/trunk/; revision=36434 --- mail/ChangeLog | 8 ++++++++ mail/em-composer-utils.c | 2 +- mail/em-folder-view.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index ac6b475abb..0725877b75 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2008-09-23 Milan Crha + + ** Part of fix for bug #553273 + + * em-composer-utils.c: (em_utils_handle_receipt): + * em-folder-view.c: (emfv_delete_msg_response): + Always end e_error_run/e_error_new calls with NULL parameter. + 2008-09-22 Luca Ferretti * default/Makefile.am: diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 415a3d7193..8d8f12550a 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1419,7 +1419,7 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage } if (account && (account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS || account->receipt_policy == E_ACCOUNT_RECEIPT_ASK) - && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg)) == GTK_RESPONSE_YES) + && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg), NULL) == GTK_RESPONSE_YES) em_utils_send_receipt(folder, msg); } diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 237276bb3a..414e72715b 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1091,7 +1091,7 @@ emfv_delete_msg_response (GtkWidget *dialog, int response, gpointer data) _("You do not have sufficient permissions to delete this mail.")); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); } else { - GtkWidget *w = e_error_new (NULL, "mail:no-delete-permission", "", ""); + GtkWidget *w = e_error_new (NULL, "mail:no-delete-permission", "", NULL); em_utils_show_error_silent (w); } -- cgit