aboutsummaryrefslogtreecommitdiffstats
path: root/modules/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-16 21:32:28 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-17 07:57:09 +0800
commit39d2c8d6cc842b4cdea948c56774e5a89d4ed8ad (patch)
treefc1bd65194553d07b08da39d981812f2f1cce574 /modules/calendar
parent519a1d0c3b3193a81e849910203e6a7ecc4ecc60 (diff)
downloadgsoc2013-evolution-39d2c8d6cc842b4cdea948c56774e5a89d4ed8ad.tar.gz
gsoc2013-evolution-39d2c8d6cc842b4cdea948c56774e5a89d4ed8ad.tar.zst
gsoc2013-evolution-39d2c8d6cc842b4cdea948c56774e5a89d4ed8ad.zip
Defer "backend-error" alerts to shell views.
Diffstat (limited to 'modules/calendar')
-rw-r--r--modules/calendar/e-cal-shell-sidebar.c49
-rw-r--r--modules/calendar/e-memo-shell-sidebar.c49
-rw-r--r--modules/calendar/e-task-shell-sidebar.c49
3 files changed, 0 insertions, 147 deletions
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index b7ab5516f7..ff533acdf2 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -178,50 +178,6 @@ cal_shell_sidebar_backend_died_cb (ECalShellSidebar *cal_shell_sidebar,
}
static void
-cal_shell_sidebar_backend_error_cb (ECalShellSidebar *cal_shell_sidebar,
- const gchar *message,
- ECalClient *client)
-{
- EShell *shell;
- EShellView *shell_view;
- EShellBackend *shell_backend;
- EShellContent *shell_content;
- EShellSidebar *shell_sidebar;
- ESourceRegistry *registry;
- ESource *parent;
- ESource *source;
- const gchar *parent_uid;
- const gchar *parent_display_name;
- const gchar *source_display_name;
-
- shell_sidebar = E_SHELL_SIDEBAR (cal_shell_sidebar);
- shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
- shell_backend = e_shell_view_get_shell_backend (shell_view);
- shell_content = e_shell_view_get_shell_content (shell_view);
-
- shell = e_shell_backend_get_shell (shell_backend);
- registry = e_shell_get_registry (shell);
-
- source = e_client_get_source (E_CLIENT (client));
-
- parent_uid = e_source_get_parent (source);
- parent = e_source_registry_ref_source (registry, parent_uid);
- g_return_if_fail (parent != NULL);
-
- parent_display_name = e_source_get_display_name (parent);
- source_display_name = e_source_get_display_name (source);
-
- e_alert_submit (
- E_ALERT_SINK (shell_content),
- "calendar:backend-error",
- parent_display_name,
- source_display_name,
- message, NULL);
-
- g_object_unref (parent);
-}
-
-static void
cal_shell_sidebar_handle_connect_error (ECalShellSidebar *cal_shell_sidebar,
const gchar *parent_display_name,
const gchar *source_display_name,
@@ -1030,11 +986,6 @@ e_cal_shell_sidebar_add_client (ECalShellSidebar *cal_shell_sidebar,
G_CALLBACK (cal_shell_sidebar_backend_died_cb),
cal_shell_sidebar);
- g_signal_connect_swapped (
- client, "backend-error",
- G_CALLBACK (cal_shell_sidebar_backend_error_cb),
- cal_shell_sidebar);
-
selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
e_source_selector_select_source (selector, source);
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 138b78d306..b282aaf17b 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -175,50 +175,6 @@ memo_shell_sidebar_backend_died_cb (EMemoShellSidebar *memo_shell_sidebar,
}
static void
-memo_shell_sidebar_backend_error_cb (EMemoShellSidebar *memo_shell_sidebar,
- const gchar *message,
- ECalClient *client)
-{
- EShell *shell;
- EShellView *shell_view;
- EShellBackend *shell_backend;
- EShellContent *shell_content;
- EShellSidebar *shell_sidebar;
- ESourceRegistry *registry;
- ESource *parent;
- ESource *source;
- const gchar *parent_uid;
- const gchar *parent_display_name;
- const gchar *source_display_name;
-
- shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar);
- shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
- shell_backend = e_shell_view_get_shell_backend (shell_view);
- shell_content = e_shell_view_get_shell_content (shell_view);
-
- shell = e_shell_backend_get_shell (shell_backend);
- registry = e_shell_get_registry (shell);
-
- source = e_client_get_source (E_CLIENT (client));
-
- parent_uid = e_source_get_parent (source);
- parent = e_source_registry_ref_source (registry, parent_uid);
- g_return_if_fail (parent != NULL);
-
- parent_display_name = e_source_get_display_name (parent);
- source_display_name = e_source_get_display_name (source);
-
- e_alert_submit (
- E_ALERT_SINK (shell_content),
- "calendar:backend-error",
- parent_display_name,
- source_display_name,
- message, NULL);
-
- g_object_unref (parent);
-}
-
-static void
memo_shell_sidebar_handle_connect_error (EMemoShellSidebar *memo_shell_sidebar,
const gchar *parent_display_name,
const gchar *source_display_name,
@@ -917,11 +873,6 @@ e_memo_shell_sidebar_add_client (EMemoShellSidebar *memo_shell_sidebar,
G_CALLBACK (memo_shell_sidebar_backend_died_cb),
memo_shell_sidebar);
- g_signal_connect_swapped (
- client, "backend-error",
- G_CALLBACK (memo_shell_sidebar_backend_error_cb),
- memo_shell_sidebar);
-
selector = e_memo_shell_sidebar_get_selector (memo_shell_sidebar);
e_source_selector_select_source (selector, source);
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index b353f8a6e1..82c6e5549e 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -175,50 +175,6 @@ task_shell_sidebar_backend_died_cb (ETaskShellSidebar *task_shell_sidebar,
}
static void
-task_shell_sidebar_backend_error_cb (ETaskShellSidebar *task_shell_sidebar,
- const gchar *message,
- ECalClient *client)
-{
- EShell *shell;
- EShellView *shell_view;
- EShellBackend *shell_backend;
- EShellContent *shell_content;
- EShellSidebar *shell_sidebar;
- ESourceRegistry *registry;
- ESource *parent;
- ESource *source;
- const gchar *parent_uid;
- const gchar *parent_display_name;
- const gchar *source_display_name;
-
- shell_sidebar = E_SHELL_SIDEBAR (task_shell_sidebar);
- shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
- shell_backend = e_shell_view_get_shell_backend (shell_view);
- shell_content = e_shell_view_get_shell_content (shell_view);
-
- shell = e_shell_backend_get_shell (shell_backend);
- registry = e_shell_get_registry (shell);
-
- source = e_client_get_source (E_CLIENT (client));
-
- parent_uid = e_source_get_parent (source);
- parent = e_source_registry_ref_source (registry, parent_uid);
- g_return_if_fail (parent != NULL);
-
- parent_display_name = e_source_get_display_name (parent);
- source_display_name = e_source_get_display_name (source);
-
- e_alert_submit (
- E_ALERT_SINK (shell_content),
- "calendar:backend-error",
- parent_display_name,
- source_display_name,
- message, NULL);
-
- g_object_unref (parent);
-}
-
-static void
task_shell_sidebar_handle_connect_error (ETaskShellSidebar *task_shell_sidebar,
const gchar *parent_display_name,
const gchar *source_display_name,
@@ -917,11 +873,6 @@ e_task_shell_sidebar_add_client (ETaskShellSidebar *task_shell_sidebar,
G_CALLBACK (task_shell_sidebar_backend_died_cb),
task_shell_sidebar);
- g_signal_connect_swapped (
- client, "backend-error",
- G_CALLBACK (task_shell_sidebar_backend_error_cb),
- task_shell_sidebar);
-
selector = e_task_shell_sidebar_get_selector (task_shell_sidebar);
e_source_selector_select_source (selector, source);