diff options
Diffstat (limited to 'calendar/gui/gnome-cal.c')
| -rw-r--r-- | calendar/gui/gnome-cal.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index cdcb323e4a..1d694e7eae 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1554,18 +1554,11 @@ client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer da { GnomeCalendar *gcal; GnomeCalendarPrivate *priv; + char *msg; gcal = GNOME_CALENDAR (data); priv = gcal->priv; - if (client == priv->client) { - e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), NULL); - } - else if (client == priv->task_pad_client) { - calendar_model_set_status_message ( - e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)), NULL); - } - switch (status) { case CAL_CLIENT_OPEN_SUCCESS: /* If this is the main CalClient, update the Date Navigator. */ @@ -1579,6 +1572,16 @@ client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer da } /* add the alarms for this client */ + msg = g_strdup_printf (_("Adding alarms for %s"), cal_client_get_uri (client)); + if (client == priv->client) { + e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), msg); + } + else if (client == priv->task_pad_client) { + calendar_model_set_status_message ( + e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)), msg); + } + g_free (msg); + add_alarms (cal_client_get_uri (client)); break; @@ -1603,6 +1606,14 @@ client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer da g_assert_not_reached (); return; } + + if (client == priv->client) { + e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), NULL); + } + else if (client == priv->task_pad_client) { + calendar_model_set_status_message ( + e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)), NULL); + } } /* Duplicates an array of categories */ |