diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/calendar-errors.xml | 6 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 10 |
3 files changed, 24 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 02b1cff878..b412920284 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2005-02-03 Vivek Jain <jvivek@novell.com> + + * calendar-errors.xml : added a warning message for invalid server + version + * gui/gnome-cal.c (default_client_cal_opened_cb) + (client_cal_opened_cb): added a case to check the + call status and display warning + 2005-02-02 Rodney Dawes <dobey@novell.com> * gui/dialogs/alarm-dialog.c (alarm_dialog_run): Set the border width diff --git a/calendar/calendar-errors.xml b/calendar/calendar-errors.xml index 9104b3a794..5b5076d450 100644 --- a/calendar/calendar-errors.xml +++ b/calendar/calendar-errors.xml @@ -191,4 +191,10 @@ <button label="_Send" response="GTK_RESPONSE_YES"/> </error> + <error id="server-version" type="warning"> + <title>Server Version</title> + <primary>Your server needs to be updated</primary> + <secondary> Some features may not work properly with the current server version</secondary> + </error> + </error-list> diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index c618ea143a..a01e26b6a2 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -2184,6 +2184,11 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) if (status == E_CALENDAR_STATUS_BUSY) return; + + if (status == E_CALENDAR_STATUS_INVALID_SERVER_VERSION) { + e_error_run (NULL, "calendar:server-version", NULL); + status = E_CALENDAR_STATUS_OK; + } if (status != E_CALENDAR_STATUS_OK) { /* Make sure the source doesn't disappear on us */ g_object_ref (source); @@ -2265,6 +2270,11 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar if (status == E_CALENDAR_STATUS_BUSY) return; + if (status == E_CALENDAR_STATUS_INVALID_SERVER_VERSION) { + e_error_run (NULL, "calendar:server-version", NULL); + status = E_CALENDAR_STATUS_OK; + } + if (status != E_CALENDAR_STATUS_OK) { /* Make sure the source doesn't disappear on us */ g_object_ref (source); |