aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/gnome-cal.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 181c388cac..d020b76afe 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-13 Rodrigo Moya <rodrigo@ximian.com>
+
+ * gui/gnome-cal.c (gnome_calendar_open): set status message to NULL
+ if there is an error opening the calendar.
+ (client_cal_opened_cb): set status message to NULL only when we have
+ successfully opened the main CalClient.
+
2002-08-09 JP Rosevear <jpr@ximian.com>
* gui/dialogs/comp-editor.c (real_send_comp): set the editor to
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index ff3f37dbc9..4e62ea8cdd 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1556,12 +1556,11 @@ client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer da
gcal = GNOME_CALENDAR (data);
priv = gcal->priv;
- e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), NULL);
-
switch (status) {
case CAL_CLIENT_OPEN_SUCCESS:
/* If this is the main CalClient, update the Date Navigator. */
if (client == priv->client) {
+ e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), NULL);
update_query (gcal);
}
@@ -1923,6 +1922,7 @@ gnome_calendar_open (GnomeCalendar *gcal, const char *str_uri)
g_message ("gnome_calendar_open(): Could not issue the request");
g_free (real_uri);
e_uri_free (uri);
+ e_week_view_set_status_message (E_WEEK_VIEW (priv->week_view), NULL);
return FALSE;
}