port calendar/ to the new EError API

https://bugzilla.gnome.org/show_bug.cgi?id=602963

8 files changed, 16 insertions, 15 deletions

diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index cdb388e7b9..69331f03a1 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -105,7 +105,7 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g
 		return FALSE;
 	}
 
-	if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
+	if (e_error_run_dialog_for_args (parent, id, NULL) == GTK_RESPONSE_YES)
 		return TRUE;
 	else
 		return FALSE;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 8fdb7d9be6..85f2304d8a 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -833,7 +833,7 @@ action_save_cb (GtkAction *action,
 	}
 
 	if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-		e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+		e_error_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 		return;
 	}
 
@@ -1833,7 +1833,7 @@ prompt_and_save_changes (CompEditor *editor, gboolean send)
 	switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) {
 	case GTK_RESPONSE_YES: /* Save */
 		if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-			e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+			e_error_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 			/* don't discard changes when selected readonly calendar */
 			return FALSE;
 		}
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 8fc8d80ddf..c205f3bd8d 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -159,7 +159,7 @@ delete_component_dialog (ECalComponent *comp,
 			arg0 = g_strdup_printf ("%d", n_comps);
 	}
 
-	response = e_error_run ((GtkWindow *) gtk_widget_get_toplevel (widget), id, arg0, NULL);
+	response = e_error_run_dialog_for_args ((GtkWindow *) gtk_widget_get_toplevel (widget), id, arg0, NULL);
 	g_free (arg0);
 
 	return response == GTK_RESPONSE_YES;
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 0d42b73b91..91f55a0ca7 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -50,13 +50,13 @@ save_component_dialog (GtkWindow *parent, ECalComponent *comp)
 		case E_CAL_COMPONENT_EVENT:
 			flags = comp_editor_get_flags (COMP_EDITOR(parent));
 			if (flags & COMP_EDITOR_MEETING)
-				return e_error_run (parent, "calendar:prompt-save-meeting", NULL);
+				return e_error_run_dialog_for_args (parent, "calendar:prompt-save-meeting", NULL);
 			else
-				return e_error_run (parent, "calendar:prompt-save-appointment", NULL);
+				return e_error_run_dialog_for_args (parent, "calendar:prompt-save-appointment", NULL);
 		case E_CAL_COMPONENT_TODO:
-			return e_error_run (parent, "calendar:prompt-save-task", NULL);
+			return e_error_run_dialog_for_args (parent, "calendar:prompt-save-task", NULL);
 		case E_CAL_COMPONENT_JOURNAL:
-			return e_error_run (parent, "calendar:prompt-save-memo", NULL);
+			return e_error_run_dialog_for_args (parent, "calendar:prompt-save-memo", NULL);
 		default:
 			return GTK_RESPONSE_NO;
 	}
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 64e0ce0d84..13f016982e 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -154,7 +154,7 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo
 		strip_alarms = NULL;
 	}
 
-	dialog = e_error_new (parent, id, NULL);
+	dialog = e_error_new_dialog_for_args (parent, id, NULL);
 
 	if (strip_alarms)
 		sa_checkbox = add_checkbox (GTK_BOX (GTK_DIALOG (dialog)->vbox), _("Send my alarms with this event"));
@@ -199,7 +199,7 @@ send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *c
 		return FALSE;
 	}
 
-	if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES)
+	if (e_error_run_dialog_for_args (parent, id, NULL) == GTK_RESPONSE_YES)
 		return TRUE;
 	else
 		return FALSE;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 84812d60c5..885cd66a90 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1202,7 +1202,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 	if (e_cal_is_read_only (default_client, &readonly, NULL) && readonly) {
 		GtkWidget *widget;
 
-		widget = e_error_new (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL);
+		widget = e_error_new_dialog_for_args (parent, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL);
 
 		g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy),
 				  widget);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 09f77fa492..1d6629aa61 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1900,7 +1900,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 			return;
 		}
 
-		w = e_error_new(parent, "calendar:server-version", NULL);
+		w = e_error_new_dialog_for_args (parent, "calendar:server-version", NULL);
 		/*e_calendar_utils_show_error_silent (w);  KILL-BONOBO */
 		g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w));
 		g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id);
@@ -1922,7 +1922,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 			return;
 		}
 
-		w = e_error_new(parent, "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL);
+		w = e_error_new_dialog_for_args (parent, "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL);
 		/*e_calendar_utils_show_error_silent (w);  KILL-BONOBO */
 		g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w));
 		g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id);
@@ -1987,7 +1987,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 		e_cal_open_async (ecal, FALSE);
 		return;
 	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
-		e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:server-version", NULL);
+		e_error_run_dialog_for_args (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:server-version", NULL);
 	default:
 		/* Make sure the source doesn't disappear on us */
 		g_object_ref (source);
@@ -2114,7 +2114,7 @@ backend_died_cb (ECal *ecal, gpointer data)
 		return;
 	}
 
-	w = e_error_new(parent, "calendar:backend_died", NULL);
+	w = e_error_new_dialog_for_args (parent, "calendar:backend_died", NULL);
 	/* e_calendar_utils_show_error_silent (w); KILL-BONOBO */
 	g_hash_table_insert (non_intrusive_error_table, (gpointer) id, g_object_ref(w));
 	g_signal_connect((GtkObject *)w, "destroy", G_CALLBACK(non_intrusive_error_remove), (gpointer) id);
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index e25857c023..5e1fdd52f0 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -32,6 +32,7 @@ libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
+	$(top_builddir)/shell/libeshell.la			\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(IMPORTERS_LIBS)