evolution r36435 - in branches/gnome-2-24: addressbook addressbook/gui/component addressbook/gui/contact-list-editor addressbook/gui/widgets calendar calendar/gui calendar/gui/alarm-notify composer mail plugins/exchange-operations

[mcrha svn gnome org]

Author: mcrha
Date: Tue Sep 23 11:42:35 2008
New Revision: 36435
URL: http://svn.gnome.org/viewvc/evolution?rev=36435&view=rev

Log:
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.



Modified:
   branches/gnome-2-24/addressbook/ChangeLog
   branches/gnome-2-24/addressbook/gui/component/addressbook-view.c
   branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-editor.c
   branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-model.c
   branches/gnome-2-24/addressbook/gui/widgets/eab-gui-util.c
   branches/gnome-2-24/calendar/ChangeLog
   branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c
   branches/gnome-2-24/calendar/gui/calendar-component.c
   branches/gnome-2-24/calendar/gui/memos-component.c
   branches/gnome-2-24/calendar/gui/tasks-component.c
   branches/gnome-2-24/composer/ChangeLog
   branches/gnome-2-24/composer/e-composer-actions.c
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/em-composer-utils.c
   branches/gnome-2-24/mail/em-folder-view.c
   branches/gnome-2-24/plugins/exchange-operations/ChangeLog
   branches/gnome-2-24/plugins/exchange-operations/exchange-config-listener.c

Modified: branches/gnome-2-24/addressbook/gui/component/addressbook-view.c
==============================================================================
--- branches/gnome-2-24/addressbook/gui/component/addressbook-view.c	(original)
+++ branches/gnome-2-24/addressbook/gui/component/addressbook-view.c	Tue Sep 23 11:42:35 2008
@@ -331,7 +331,7 @@
 	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 @@
 
 	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 */

Modified: branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-editor.c
==============================================================================
--- branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-editor.c	(original)
+++ branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-editor.c	Tue Sep 23 11:42:35 2008
@@ -261,7 +261,7 @@
 	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

Modified: branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-model.c
==============================================================================
--- branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-model.c	(original)
+++ branches/gnome-2-24/addressbook/gui/contact-list-editor/e-contact-list-model.c	Tue Sep 23 11:42:35 2008
@@ -152,7 +152,7 @@
 	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 ();

Modified: branches/gnome-2-24/addressbook/gui/widgets/eab-gui-util.c
==============================================================================
--- branches/gnome-2-24/addressbook/gui/widgets/eab-gui-util.c	(original)
+++ branches/gnome-2-24/addressbook/gui/widgets/eab-gui-util.c	Tue Sep 23 11:42:35 2008
@@ -404,7 +404,7 @@
 		 * {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;
 	}

Modified: branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c	(original)
+++ branches/gnome-2-24/calendar/gui/alarm-notify/alarm-queue.c	Tue Sep 23 11:42:35 2008
@@ -930,7 +930,7 @@
 						      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 @@
 	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);
 

Modified: branches/gnome-2-24/calendar/gui/calendar-component.c
==============================================================================
--- branches/gnome-2-24/calendar/gui/calendar-component.c	(original)
+++ branches/gnome-2-24/calendar/gui/calendar-component.c	Tue Sep 23 11:42:35 2008
@@ -568,7 +568,7 @@
 		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 */

Modified: branches/gnome-2-24/calendar/gui/memos-component.c
==============================================================================
--- branches/gnome-2-24/calendar/gui/memos-component.c	(original)
+++ branches/gnome-2-24/calendar/gui/memos-component.c	Tue Sep 23 11:42:35 2008
@@ -415,7 +415,7 @@
 		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 */

Modified: branches/gnome-2-24/calendar/gui/tasks-component.c
==============================================================================
--- branches/gnome-2-24/calendar/gui/tasks-component.c	(original)
+++ branches/gnome-2-24/calendar/gui/tasks-component.c	Tue Sep 23 11:42:35 2008
@@ -406,7 +406,7 @@
 		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 */

Modified: branches/gnome-2-24/composer/e-composer-actions.c
==============================================================================
--- branches/gnome-2-24/composer/e-composer-actions.c	(original)
+++ branches/gnome-2-24/composer/e-composer-actions.c	Tue Sep 23 11:42:35 2008
@@ -246,7 +246,7 @@
 			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 @@
 		e_error_run (
 			GTK_WINDOW (composer),
 			E_ERROR_NO_SAVE_FILE,
-			filename, error->message);
+			filename, error->message, NULL);
 		g_error_free (error);
 		return;
 	}

Modified: branches/gnome-2-24/mail/em-composer-utils.c
==============================================================================
--- branches/gnome-2-24/mail/em-composer-utils.c	(original)
+++ branches/gnome-2-24/mail/em-composer-utils.c	Tue Sep 23 11:42:35 2008
@@ -1419,7 +1419,7 @@
 	}
 
 	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);
 }
 

Modified: branches/gnome-2-24/mail/em-folder-view.c
==============================================================================
--- branches/gnome-2-24/mail/em-folder-view.c	(original)
+++ branches/gnome-2-24/mail/em-folder-view.c	Tue Sep 23 11:42:35 2008
@@ -1091,7 +1091,7 @@
 							_("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);
 				}
 

Modified: branches/gnome-2-24/plugins/exchange-operations/exchange-config-listener.c
==============================================================================
--- branches/gnome-2-24/plugins/exchange-operations/exchange-config-listener.c	(original)
+++ branches/gnome-2-24/plugins/exchange-operations/exchange-config-listener.c	Tue Sep 23 11:42:35 2008
@@ -776,7 +776,7 @@
 		}
 
 		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);