show the progress indication in the view while downloading calendar items

from EDS

svn path=/trunk/; revision=29618

9 files changed, 137 insertions, 39 deletions

diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index ff8872d129..95bb927164 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -100,6 +100,8 @@ static void remove_client (ECalModel *model, ECalModelClient *client_data);
 enum {
 	TIME_RANGE_CHANGED,
 	ROW_APPENDED,
+	CAL_VIEW_PROGRESS,
+	CAL_VIEW_DONE,
 	LAST_SIGNAL
 };
 
@@ -148,6 +150,23 @@ e_cal_model_class_init (ECalModelClass *klass)
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
+	signals[CAL_VIEW_PROGRESS] =
+		g_signal_new ("cal_view_progress",
+			      G_TYPE_FROM_CLASS (klass),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (ECalModelClass, cal_view_progress),
+			      NULL, NULL,
+	                      e_calendar_marshal_VOID__STRING_INT_INT,
+			      G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+	signals[CAL_VIEW_DONE] =
+		g_signal_new ("cal_view_done",
+			      G_TYPE_FROM_CLASS (klass),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (ECalModelClass, cal_view_done),
+			      NULL, NULL,
+			      e_calendar_marshal_VOID__INT_INT,
+			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+
 }
 
 static void
@@ -1417,20 +1436,25 @@ static void
 e_cal_view_progress_cb (ECalView *query, const char *message, int percent, gpointer user_data)
 {
 	ECalModel *model = (ECalModel *) user_data;
+	ECal *client = e_cal_view_get_client (query);
 
 	g_return_if_fail (E_IS_CAL_MODEL (model));
 
-	/* FIXME Update status bar */
+	g_signal_emit (G_OBJECT (model), signals[CAL_VIEW_PROGRESS], 0, message, 
+			percent, e_cal_get_source_type (client));
 }
 
 static void
 e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer user_data)
 {
  	ECalModel *model = (ECalModel *) user_data;
+	ECal *client = e_cal_view_get_client (query);
 
 	g_return_if_fail (E_IS_CAL_MODEL (model));
 
-	/* FIXME Clear status bar */
+	/* emit the signal on the model and let the view catch it to display */
+	g_signal_emit (G_OBJECT (model), signals[CAL_VIEW_DONE], 0, status,
+			e_cal_get_source_type (client));
 }
 
 static void
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 8a2eec933e..b48462418e 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -92,6 +92,8 @@ typedef struct {
 	/* Signals */
 	void (* time_range_changed) (ECalModel *model, time_t start, time_t end);
 	void (* row_appended) (ECalModel *model);
+	void (* cal_view_progress) (ECalModel *model, const char *message, int progress, ECalSourceType type);
+	void (* cal_view_done) (ECalModel *model, ECalendarStatus status, ECalSourceType type);
 } ECalModelClass;
 
 GType               e_cal_model_get_type                       (void);
diff --git a/calendar/gui/e-calendar-marshal.list b/calendar/gui/e-calendar-marshal.list
index 942e8d03e7..1b258f9244 100644
--- a/calendar/gui/e-calendar-marshal.list
+++ b/calendar/gui/e-calendar-marshal.list
@@ -17,3 +17,4 @@ NONE:POINTER,ENUM
 NONE:POINTER,STRING
 NONE:POINTER,POINTER
 NONE:LONG,LONG
+NONE:STRING,INT,INT
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index f68c3a317d..5b11c4420a 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -691,7 +691,7 @@ delete_selected_components (ECalendarTable *cal_table)
 
 	objs = get_selected_objects (cal_table);
 
-	e_calendar_table_set_status_message (cal_table, _("Deleting selected objects"));
+	e_calendar_table_set_status_message (cal_table, _("Deleting selected objects"), -1);
 
 	for (l = objs; l; l = l->next) {
 		ECalModelComponent *comp_data = (ECalModelComponent *) l->data;
@@ -703,7 +703,7 @@ delete_selected_components (ECalendarTable *cal_table)
 		g_clear_error (&error);
 	}
 
-	e_calendar_table_set_status_message (cal_table, NULL);
+	e_calendar_table_set_status_message (cal_table, NULL, -1);
 
 	g_slist_free (objs);
 }
@@ -870,7 +870,7 @@ clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarTabl
 
 	client = e_cal_model_get_default_client (cal_table->model);
 	
-	e_calendar_table_set_status_message (cal_table, _("Updating objects"));
+	e_calendar_table_set_status_message (cal_table, _("Updating objects"), -1);
 
 	if (kind == ICAL_VCALENDAR_COMPONENT) {
 		icalcomponent_kind child_kind;
@@ -916,7 +916,7 @@ clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarTabl
 		g_object_unref (comp);
 	}
 
-	e_calendar_table_set_status_message (cal_table, NULL);
+	e_calendar_table_set_status_message (cal_table, NULL, -1);
 }
 
 /**
@@ -1343,7 +1343,7 @@ e_calendar_table_set_activity_handler (ECalendarTable *cal_table, EActivityHandl
 }
 
 void
-e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message)
+e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *message, int percent)
 {
         g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
 
@@ -1366,6 +1366,15 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes
 
                 g_free (client_id);
         } else {
-                e_activity_handler_operation_progressing (cal_table->activity_handler, cal_table->activity_id, message, -1.0);
+		
+		double progress;
+		
+		if (percent < 0)
+			progress = -1.0;
+		else {
+			progress = ((double) percent / 100);
+		}
+
+                e_activity_handler_operation_progressing (cal_table->activity_handler, cal_table->activity_id, message, progress);
 	}
 }
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index c7a391a7f6..9c8d7087d0 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -102,7 +102,8 @@ void	   e_calendar_table_save_state		(ECalendarTable *cal_table,
 void       e_calendar_table_set_activity_handler (ECalendarTable *cal_table,
 						  EActivityHandler *activity_handler);
 void       e_calendar_table_set_status_message (ECalendarTable *cal_table,
-						const gchar *message);
+						const gchar *message,
+						int percent);
 
 G_END_DECLS
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 05bedbbd84..8d65a7808d 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -550,7 +550,7 @@ e_calendar_view_set_activity_handler (ECalendarView *cal_view, EActivityHandler
 }
 
 void
-e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message)
+e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, int percent)
 {
 	ECalendarViewPrivate *priv;
 	
@@ -576,7 +576,15 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag
 
 		g_free (client_id);
 	} else {
-		e_activity_handler_operation_progressing (priv->activity_handler, priv->activity_id, message, -1.0);
+		double progress;
+		
+		if (percent < 0)
+			progress = -1.0;
+		else {
+			progress = ((double) percent / 100);
+		}
+
+		e_activity_handler_operation_progressing (priv->activity_handler, priv->activity_id, message, progress);
 	}
 }
 
@@ -650,7 +658,7 @@ e_calendar_view_cut_clipboard (ECalendarView *cal_view)
 	if (!selected)
 		return;
 
-	e_calendar_view_set_status_message (cal_view, _("Deleting selected objects"));
+	e_calendar_view_set_status_message (cal_view, _("Deleting selected objects"), -1);
 
 	e_calendar_view_copy_clipboard (cal_view);
 	for (l = selected; l != NULL; l = l->next) {
@@ -693,7 +701,7 @@ e_calendar_view_cut_clipboard (ECalendarView *cal_view)
 		g_object_unref (comp);
 	}
 
-	e_calendar_view_set_status_message (cal_view, NULL);
+	e_calendar_view_set_status_message (cal_view, NULL, -1);
 
 	g_list_free (selected);
 }
@@ -777,7 +785,7 @@ clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarView
 	if (kind != ICAL_VCALENDAR_COMPONENT && kind != ICAL_VEVENT_COMPONENT)
 		return;
 
-	e_calendar_view_set_status_message (cal_view, _("Updating objects"));
+	e_calendar_view_set_status_message (cal_view, _("Updating objects"), -1);
 	e_calendar_view_get_selected_time_range (cal_view, &selected_time_start, &selected_time_end);
 
 	if ((selected_time_end - selected_time_start) == 60 * 60 * 24)
@@ -816,7 +824,7 @@ clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarView
 		e_calendar_view_add_event (cal_view, client, selected_time_start, default_zone, icalcomp, in_top_canvas);
 	}
 
-	e_calendar_view_set_status_message (cal_view, NULL);
+	e_calendar_view_set_status_message (cal_view, NULL, -1);
 }
 
 void
@@ -1201,14 +1209,14 @@ transfer_selected_items (ECalendarView *cal_view, gboolean remove_item)
 
 	/* process all selected events */
 	if (remove_item)
-		e_calendar_view_set_status_message (cal_view, _("Moving items"));
+		e_calendar_view_set_status_message (cal_view, _("Moving items"), -1);
 	else
-		e_calendar_view_set_status_message (cal_view, _("Copying items"));
+		e_calendar_view_set_status_message (cal_view, _("Copying items"), -1);
 
 	for (l = selected; l != NULL; l = l->next)
 		transfer_item_to ((ECalendarViewEvent *) l->data, dest_client, remove_item);
 
-	e_calendar_view_set_status_message (cal_view, NULL);
+	e_calendar_view_set_status_message (cal_view, NULL, -1);
 
 	/* free memory */
 	g_object_unref (destination_source);
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 8335352976..dbcfbc55f7 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -113,7 +113,7 @@ gboolean       e_calendar_view_get_use_24_hour_format (ECalendarView *view);
 void           e_calendar_view_set_use_24_hour_format (ECalendarView *view, gboolean use_24_hour);
 
 void           e_calendar_view_set_activity_handler (ECalendarView *cal_view, EActivityHandler *activity_handler);
-void           e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message);
+void           e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *message, int percent);
 
 GList         *e_calendar_view_get_selected_events (ECalendarView *cal_view);
 gboolean       e_calendar_view_get_selected_time_range (ECalendarView *cal_view, time_t *start_time, time_t *end_time);
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 22d94983ac..00b6212124 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -330,6 +330,21 @@ model_row_changed_cb (ETableModel *etm, int row, gpointer data)
 }
 
 static void
+view_progress_cb (ECalModel *model, const char *message, int percent, ECalSourceType type, ETasks *tasks)
+{
+	e_calendar_table_set_status_message (E_CALENDAR_TABLE (e_tasks_get_calendar_table (tasks)), 
+			message, percent);
+}
+
+static void
+view_done_cb (ECalModel *model, ECalendarStatus status, ECalSourceType type, ETasks *tasks)
+{
+	e_calendar_table_set_status_message (E_CALENDAR_TABLE (e_tasks_get_calendar_table (tasks)), 
+			NULL, -1);
+			
+}
+
+static void
 setup_config (ETasks *tasks)
 {
 	ETasksPrivate *priv;
@@ -540,6 +555,11 @@ setup_widgets (ETasks *tasks)
 	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
 	g_signal_connect (G_OBJECT (model), "model_row_changed",
 			  G_CALLBACK (model_row_changed_cb), tasks);
+	
+	g_signal_connect (G_OBJECT (model), "cal_view_progress",
+				G_CALLBACK (view_progress_cb), tasks);
+	g_signal_connect (G_OBJECT (model), "cal_view_done",
+				G_CALLBACK (view_done_cb), tasks);
 }
 
 /* Class initialization function for the gnome calendar */
@@ -744,7 +764,7 @@ set_status_message (ETasks *tasks, const char *message, ...)
 
 	priv = tasks->priv;
 	
-	e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->tasks_view), msg_string);
+	e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->tasks_view), msg_string, -1);
 }
 
 /* Callback from the calendar client when an error occurs in the backend */
@@ -784,7 +804,7 @@ backend_died_cb (ECal *client, gpointer data)
 
 	gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SOURCE_REMOVED], source);
 
-	e_calendar_table_set_status_message (E_CALENDAR_TABLE (e_tasks_get_calendar_table (tasks)), NULL);
+	e_calendar_table_set_status_message (E_CALENDAR_TABLE (e_tasks_get_calendar_table (tasks)), NULL, -1);
 	
 	e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))),
 		     "calendar:tasks-crashed", NULL);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 52043b4cec..0a42ce13ee 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -719,7 +719,7 @@ update_query (GnomeCalendar *gcal)
 	if (priv->updating == TRUE) {
 		return;
 	}
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), _("Updating query"));
+	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), _("Updating query"), -1);
 	e_calendar_item_clear_marks (priv->date_navigator->calitem);
 
 	priv->updating = TRUE;
@@ -741,7 +741,7 @@ update_query (GnomeCalendar *gcal)
 
 	real_sexp = adjust_e_cal_view_sexp (gcal, priv->sexp);
 	if (!real_sexp) {
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 		priv->updating = FALSE;
 		return; /* No time range is set, so don't start a query */
 	}
@@ -776,7 +776,7 @@ update_query (GnomeCalendar *gcal)
 	/* free memory */
 	priv->updating = FALSE;
 	g_free (real_sexp);
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
+	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 	update_todo_view (gcal);
 }
 
@@ -1226,6 +1226,28 @@ config_categories_changed_cb (EConfigListener *config_listener, const char *key,
 	g_ptr_array_free (cat_array, TRUE);
 }
 
+
+static void
+view_progress_cb (ECalModel *model, const char *message, int percent, ECalSourceType type, GnomeCalendar *gcal)
+{
+	if (type == E_CAL_SOURCE_TYPE_EVENT) {
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (gcal->priv->week_view), message, percent);
+	} else if (type == E_CAL_SOURCE_TYPE_TODO) {
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (gcal->priv->todo), message, percent);
+	}
+}
+
+static void
+view_done_cb (ECalModel *model, ECalendarStatus status, ECalSourceType type, GnomeCalendar *gcal)
+{
+	if (type == E_CAL_SOURCE_TYPE_EVENT) {
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (gcal->priv->week_view), NULL, -1);
+	} else if (type == E_CAL_SOURCE_TYPE_TODO) {
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (gcal->priv->todo), NULL, -1);
+	}
+			
+}
+
 static void
 setup_widgets (GnomeCalendar *gcal)
 {
@@ -1234,6 +1256,7 @@ setup_widgets (GnomeCalendar *gcal)
 	gchar *filename;
 	ETable *etable;
 	GtkAdjustment *adjustment;
+	ECalModel *w_model;
 	int i;
 
 	priv = gcal->priv;
@@ -1313,6 +1336,11 @@ setup_widgets (GnomeCalendar *gcal)
 
 	g_signal_connect (etable, "selection_change",
 			  G_CALLBACK (table_selection_change_cb), gcal);
+	
+	g_signal_connect (e_calendar_table_get_model (priv->todo), "cal_view_progress",
+				G_CALLBACK (view_progress_cb), gcal);
+	g_signal_connect (e_calendar_table_get_model (priv->todo), "cal_view_done",
+				G_CALLBACK (view_done_cb), gcal);
 
 	/* Timeout check to hide completed items */
 	priv->update_timeout = g_timeout_add_full (G_PRIORITY_LOW, 60000, (GSourceFunc) update_todo_view_cb, gcal, NULL);	
@@ -1350,6 +1378,11 @@ setup_widgets (GnomeCalendar *gcal)
 	g_signal_connect (adjustment, "value_changed",
 			  G_CALLBACK (week_view_adjustment_changed_cb),
 			  gcal);
+	w_model = e_calendar_view_get_model (priv->week_view);
+	g_signal_connect (w_model, "cal_view_progress",
+				G_CALLBACK (view_progress_cb), gcal);
+	g_signal_connect (w_model, "cal_view_done",
+				G_CALLBACK (view_done_cb), gcal);
 	
 	/* The Month View. */
 	priv->month_view = e_week_view_new ();
@@ -1366,7 +1399,7 @@ setup_widgets (GnomeCalendar *gcal)
 	g_signal_connect (adjustment, "value_changed",
 			  G_CALLBACK (month_view_adjustment_changed_cb),
 			  gcal);
-
+			
 	/* The List View. */
 	priv->list_view = e_cal_list_view_new ();
 
@@ -2212,10 +2245,10 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 		break;
 	case E_CAL_SOURCE_TYPE_TODO:
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL, -1);
 		break;
 	default:
 		break;
@@ -2255,7 +2288,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT :
 		msg = g_strdup_printf (_("Loading appointments at %s"), e_cal_get_uri (ecal));
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), msg);
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), msg, -1);
 		g_free (msg);
 
 		/* add client to the views */
@@ -2269,17 +2302,17 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 		/* update date navigator query */
 		update_query (gcal);
 
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 		break;
 		
 	case E_CAL_SOURCE_TYPE_TODO :
 		msg = g_strdup_printf (_("Loading tasks at %s"), e_cal_get_uri (ecal));
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg);
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg, -1);
 		g_free (msg);
 
 		e_cal_model_add_client (e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)), ecal);
 
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL, -1);
 		break;
 		
 	default:
@@ -2305,10 +2338,10 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 		break;		
 	case E_CAL_SOURCE_TYPE_TODO:
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL, -1);
 		break;
 	default:
 		break;
@@ -2377,10 +2410,10 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of
 	msg = g_strdup_printf (_("Opening %s"), e_cal_get_uri (cal));
 	switch (e_cal_get_source_type (cal)) {
 	case E_CAL_SOURCE_TYPE_EVENT :
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), msg);
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), msg, -1);
 		break;
 	case E_CAL_SOURCE_TYPE_TODO :
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg);
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg, -1);
 		break;
 	default:
 		g_assert_not_reached ();
@@ -2440,7 +2473,7 @@ backend_died_cb (ECal *ecal, gpointer data)
 	case E_CAL_SOURCE_TYPE_EVENT:		
 		id = "calendar:calendar-crashed";
 		
-		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
+		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 
 		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
 		break;
@@ -2448,7 +2481,7 @@ backend_died_cb (ECal *ecal, gpointer data)
 	case E_CAL_SOURCE_TYPE_TODO:
 		id = "calendar:tasks-crashed";
 		
-		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
+		e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL, -1);
 
 		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
 		break;
@@ -3264,7 +3297,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 				"                      (make-time \"%s\"))",
 				start, end);
 
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), _("Purging"));
+	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), _("Purging"), -1);
 
 	/* FIXME Confirm expunge */
 	for (l = priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
@@ -3301,7 +3334,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than)
 		g_list_free (objects);
 	}
 
-	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL);
+	e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 
 	g_free (sexp);
 	g_free (start);