aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/gui/e-tasks.c4
-rw-r--r--calendar/gui/gnome-cal.c5
3 files changed, 19 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a75db139a2..0a21c0d609 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-30 Harish Krishnaswamy <kharish@novell.com>
+
+ * gui/e-tasks.c: (client_cal_opened_cb),
+ (default_client_cal_opened_cb):
+ * gui/gnome-cal.c: (client_cal_opened_cb),
+ (default_client_cal_opened_cb):
+ Handle E_CALENDAR_STATUS_BUSY conditions and do not
+ remove the source from the gnome-calendar. The fix
+ for #59335 exposed this problem.
+
2004-07-28 Larry Ewing <lewing@novell.com>
* gui/dialogs/calendar-setup.c (dialog_hide_unused_options): hide
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index a935f09863..80ae78142a 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -796,6 +796,8 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
set_timezone (tasks);
set_status_message (tasks, NULL);
break;
+ case E_CALENDAR_STATUS_BUSY :
+ break;
default :
/* Make sure the source doesn't disappear on us */
g_object_ref (source);
@@ -836,6 +838,8 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
set_timezone (tasks);
e_cal_model_set_default_client (model, ecal);
break;
+ case E_CALENDAR_STATUS_BUSY:
+ break;
default :
/* Make sure the source doesn't disappear on us */
g_object_ref (source);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index cbddfcbf4c..7efc11501e 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2013,6 +2013,8 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
else
e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
+ if (status == E_CALENDAR_STATUS_BUSY)
+ return;
if (status != E_CALENDAR_STATUS_OK) {
/* Make sure the source doesn't disappear on us */
g_object_ref (source);
@@ -2085,6 +2087,9 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
else
e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), NULL);
+ if (status == E_CALENDAR_STATUS_BUSY)
+ return;
+
if (status != E_CALENDAR_STATUS_OK) {
/* Make sure the source doesn't disappear on us */
g_object_ref (source);