aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/calendar.error.xml7
-rw-r--r--modules/calendar/e-memo-shell-view-actions.c33
2 files changed, 24 insertions, 16 deletions
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 3d5140d03c..884fab9d6e 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -233,6 +233,13 @@
<button _label="_Delete From Server" response="GTK_RESPONSE_YES"/>
</error>
+ <error id="prompt-delete-remote-memo-list" type="question" default="GTK_RESPONSE_CANCEL">
+ <_primary>Delete remote memo list &quot;{0}&quot;?</_primary>
+ <_secondary>This will permanently remote the memo list &quot;{0}&quot; from the server. Are you sure you want to proceed?</_secondary>
+ <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
+ <button _label="_Delete From Server" response="GTK_RESPONSE_YES"/>
+ </error>
+
<error id="prompt-save-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
<_primary>Are you sure you want to save the appointment without a summary?</_primary>
<_secondary>Adding a meaningful summary to your appointment will give you an idea of what your appointment is about.</_secondary>
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index 689d65c796..4a433a6f88 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -150,8 +150,8 @@ action_memo_list_delete_cb (GtkAction *action,
EMemoShellSidebar *memo_shell_sidebar;
EShellWindow *shell_window;
EShellView *shell_view;
- ESourceSelector *selector;
ESource *source;
+ ESourceSelector *selector;
gint response;
shell_view = E_SHELL_VIEW (memo_shell_view);
@@ -159,27 +159,28 @@ action_memo_list_delete_cb (GtkAction *action,
memo_shell_sidebar = memo_shell_view->priv->memo_shell_sidebar;
selector = e_memo_shell_sidebar_get_selector (memo_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-memo-list",
- 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-memo-list",
+ 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_memo_shell_sidebar_remove_source (
- memo_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-memo-list",
+ 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);
}