From 8c99b707e70886f23bd11be088a55b9fc5e54308 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 26 Jul 2012 11:25:29 -0400 Subject: e-cal-shell-view-actions.c: Support deleting remote resources. --- modules/calendar/e-cal-shell-view-actions.c | 33 +++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 09ad350b9d..f5a04d7d2f 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -68,8 +68,8 @@ action_calendar_delete_cb (GtkAction *action, ECalShellSidebar *cal_shell_sidebar; EShellWindow *shell_window; EShellView *shell_view; - ESourceSelector *selector; ESource *source; + ESourceSelector *selector; gint response; shell_view = E_SHELL_VIEW (cal_shell_view); @@ -77,27 +77,28 @@ action_calendar_delete_cb (GtkAction *action, cal_shell_sidebar = cal_shell_view->priv->cal_shell_sidebar; selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar); + source = e_source_selector_ref_primary_selection (selector); g_return_if_fail (source != NULL); - /* Ask for confirmation. */ - response = e_alert_run_dialog_for_args ( - GTK_WINDOW (shell_window), - "calendar:prompt-delete-calendar", - e_source_get_display_name (source), NULL); + if (e_source_get_remote_deletable (source)) { + response = e_alert_run_dialog_for_args ( + GTK_WINDOW (shell_window), + "calendar:prompt-delete-remote-calendar", + e_source_get_display_name (source), NULL); - if (response != GTK_RESPONSE_YES) { - g_object_unref (source); - return; - } + if (response == GTK_RESPONSE_YES) + e_shell_view_remote_delete_source (shell_view, source); - if (e_source_selector_source_is_selected (selector, source)) { - e_cal_shell_sidebar_remove_source ( - cal_shell_sidebar, source); - e_source_selector_unselect_source (selector, source); - } + } else { + response = e_alert_run_dialog_for_args ( + GTK_WINDOW (shell_window), + "calendar:prompt-delete-calendar", + e_source_get_display_name (source), NULL); - e_shell_view_remove_source (shell_view, source); + if (response == GTK_RESPONSE_YES) + e_shell_view_remove_source (shell_view, source); + } g_object_unref (source); } -- cgit v1.2.3