aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/gnome-cal.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1d26df9a52..fad3b52e9e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,11 @@
2005-03-21 JP Rosevear <jpr@novell.com>
+ * gui/gnome-cal.c (default_client_cal_opened_cb): if its busy, try
+ again
+ (client_cal_opened_cb): ditto
+
+2005-03-21 JP Rosevear <jpr@novell.com>
+
* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
abort sequence
(e_day_view_on_top_canvas_motion): prevent drag of recurring events
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 5c8d6e0ad1..c515dc36e9 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2199,6 +2199,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
case E_CALENDAR_STATUS_OK:
break;
case E_CALENDAR_STATUS_BUSY:
+ e_cal_open_async (ecal, FALSE);
return;
case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
e_error_run (NULL, "calendar:server-version", NULL);
@@ -2289,6 +2290,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
case E_CALENDAR_STATUS_OK:
break;
case E_CALENDAR_STATUS_BUSY:
+ e_cal_open_async (ecal, FALSE);
return;
case E_CALENDAR_STATUS_INVALID_SERVER_VERSION :
e_error_run (NULL, "calendar:server-version", NULL);