diff options
| -rw-r--r-- | calendar/calendar.error.xml | 18 | ||||
| -rw-r--r-- | modules/calendar/e-cal-shell-sidebar.c | 12 | ||||
| -rw-r--r-- | modules/calendar/e-memo-shell-sidebar.c | 12 | ||||
| -rw-r--r-- | modules/calendar/e-task-shell-sidebar.c | 12 |
4 files changed, 54 insertions, 0 deletions
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml index 6ba4ed1e8d..3d1f2c94a5 100644 --- a/calendar/calendar.error.xml +++ b/calendar/calendar.error.xml @@ -271,6 +271,24 @@ <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/> </error> + <error id="failed-open-calendar" type="error" default="GTK_RESPONSE_YES"> + <_primary>Error loading calendar</_primary> + <secondary>{0}</secondary> + <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/> + </error> + + <error id="failed-open-tasks" type="error" default="GTK_RESPONSE_YES"> + <_primary>Error loading task list</_primary> + <secondary>{0}</secondary> + <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/> + </error> + + <error id="failed-open-memos" type="error" default="GTK_RESPONSE_YES"> + <_primary>Error loading memo list</_primary> + <secondary>{0}</secondary> + <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/> + </error> + <error id="server-version" type="warning"> <_primary>Some features may not work properly with your current server.</_primary> <_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version.</_secondary> diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index b8b7f4b03e..1cd4ba9619 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -215,6 +215,13 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar, /* fall through */ default: + if (error->code != E_CALENDAR_STATUS_REPOSITORY_OFFLINE) { + e_alert_run_dialog_for_args ( + GTK_WINDOW (shell_window), + "calendar:failed-open-calendar", + error->message, NULL); + } + e_cal_shell_sidebar_remove_source ( cal_shell_sidebar, e_cal_get_source (client)); @@ -263,6 +270,11 @@ cal_shell_sidebar_default_opened_cb (ECalShellSidebar *cal_shell_sidebar, return; default: + e_alert_run_dialog_for_args ( + GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), + "calendar:failed-open-calendar", + error->message, NULL); + e_cal_shell_sidebar_remove_source ( cal_shell_sidebar, e_cal_get_source (client)); diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index c0001d19af..7b4b8f71b6 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -209,6 +209,13 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar, /* fall through */ default: + if (error->code != E_CALENDAR_STATUS_REPOSITORY_OFFLINE) { + e_alert_run_dialog_for_args ( + GTK_WINDOW (shell_window), + "calendar:failed-open-memos", + error->message, NULL); + } + e_memo_shell_sidebar_remove_source ( memo_shell_sidebar, e_cal_get_source (client)); @@ -257,6 +264,11 @@ memo_shell_sidebar_default_opened_cb (EMemoShellSidebar *memo_shell_sidebar, return; default: + e_alert_run_dialog_for_args ( + GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), + "calendar:failed-open-memos", + error->message, NULL); + e_memo_shell_sidebar_remove_source ( memo_shell_sidebar, e_cal_get_source (client)); diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index 4f870ec19a..8613b4eb0f 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -209,6 +209,13 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar, /* fall through */ default: + if (error->code != E_CALENDAR_STATUS_REPOSITORY_OFFLINE) { + e_alert_run_dialog_for_args ( + GTK_WINDOW (shell_window), + "calendar:failed-open-tasks", + error->message, NULL); + } + e_task_shell_sidebar_remove_source ( task_shell_sidebar, e_cal_get_source (client)); @@ -257,6 +264,11 @@ task_shell_sidebar_default_opened_cb (ETaskShellSidebar *task_shell_sidebar, return; default: + e_alert_run_dialog_for_args ( + GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), + "calendar:failed-open-tasks", + error->message, NULL); + e_task_shell_sidebar_remove_source ( task_shell_sidebar, e_cal_get_source (client)); |