** Fix for bug #553273

2008-09-23  Milan Crha  <mcrha@redhat.com>

	** 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

17 files changed, 60 insertions, 15 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;
 	}
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7f40efb87c..a774288a9f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* gui/alarm-notify/alarm-queue.c: (edit_component):
+	* gui/tasks-component.c: (delete_task_list_cb):
+	* gui/calendar-component.c: (delete_calendar_cb):
+	* gui/memos-component.c: (delete_memo_list_cb):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
 2008-09-19  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 1e7f498f7a..f320ccc42b 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -930,7 +930,7 @@ edit_component (ECal *client, ECalComponent *comp)
 						      0, NULL, &ev);
 
 	if (BONOBO_EX (&ev)) {
-		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
+		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
 		CORBA_exception_free (&ev);
 		return;
 	}
@@ -947,7 +947,7 @@ edit_component (ECal *client, ECalComponent *comp)
 	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev);
 
 	if (BONOBO_EX (&ev))
-		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
+		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
 
 	CORBA_exception_free (&ev);
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5ba3b11e96..080858c448 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -568,7 +568,7 @@ delete_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
 		return;
 
 	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-calendar", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
+			"calendar:prompt-delete-calendar", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
 		return;
 
 	/* first, ask the backend to remove the calendar */
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index adf54c5c2d..cee6031404 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -415,7 +415,7 @@ delete_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 		return;
 
 	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-memo-list", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
+			"calendar:prompt-delete-memo-list", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
 		return;
 
 	/* first, ask the backend to remove the memo list */
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index ac272c83d1..03bc48db2e 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -406,7 +406,7 @@ delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 		return;
 
 	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-task-list", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
+			"calendar:prompt-delete-task-list", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
 		return;
 
 	/* first, ask the backend to remove the task list */
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 7afbe38079..f18cb91c33 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* e-composer-actions.c: (action_save_cb):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
 2008-09-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #551548
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 3146d9614b..c88f7e301e 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -246,7 +246,7 @@ action_save_cb (GtkAction *action,
 			e_error_run (
 				GTK_WINDOW (composer),
 				E_ERROR_NO_SAVE_FILE, filename,
-				g_strerror (errno_saved));
+				g_strerror (errno_saved), NULL);
 			return;
 		}
 	} else
@@ -256,7 +256,7 @@ action_save_cb (GtkAction *action,
 		e_error_run (
 			GTK_WINDOW (composer),
 			E_ERROR_NO_SAVE_FILE,
-			filename, error->message);
+			filename, error->message, NULL);
 		g_error_free (error);
 		return;
 	}
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  <mcrha@redhat.com>
+
+	** 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  <elle.uca@libero.it>
 
 	* 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);
 				}
 
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 2c1adc7d7a..2f39329033 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* exchange-config-listener.c: (exchange_config_listener_authenticate):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
 2008-09-16  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 913778a1b1..308e73daaf 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -776,7 +776,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		}
 
 		if (current_quota_usage) {
-			widget = e_error_new (NULL, error_code, current_quota_usage);
+			widget = e_error_new (NULL, error_code, current_quota_usage, NULL);
 			g_signal_connect ((GtkDialog *)widget, "response",
 					  G_CALLBACK (gtk_widget_destroy), widget);
 			gtk_widget_show (widget);