aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-utils.c
diff options
context:
space:
mode:
authorViswanath Sivakumar <viswanathgs@gmail.com>2010-02-22 18:59:23 +0800
committerBharath Acharya <abharath@novell.com>2010-02-22 18:59:23 +0800
commit8785fd3315996dffceec133f94096577a5547cbc (patch)
treeea567426ee8289d16c06255271b528c137cefeb5 /mail/em-folder-utils.c
parent6c56bea75fb7915b9634af52e82a79be98658265 (diff)
downloadgsoc2013-evolution-8785fd3315996dffceec133f94096577a5547cbc.tar.gz
gsoc2013-evolution-8785fd3315996dffceec133f94096577a5547cbc.tar.zst
gsoc2013-evolution-8785fd3315996dffceec133f94096577a5547cbc.zip
Bug 546551 - Dialog for deleting mail folders always mentions subfolders.
Diffstat (limited to 'mail/em-folder-utils.c')
-rw-r--r--mail/em-folder-utils.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 5544d03e70..2ab31e3827 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -460,9 +460,17 @@ em_folder_utils_delete_folder (CamelFolder *folder)
camel_object_ref (folder);
- dialog = e_alert_dialog_new_for_args (parent,
+ if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (), folder, &flags) && (flags & CAMEL_FOLDER_CHILDREN)) {
+ dialog = e_alert_dialog_new_for_args (parent,
(folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
folder->full_name, NULL);
+ }
+ else {
+ dialog = e_alert_dialog_new_for_args (parent,
+ (folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder-nochild":"mail:ask-delete-folder-nochild",
+ folder->full_name, NULL);
+ }
+
g_object_set_data_full ((GObject *) dialog, "folder", folder, camel_object_unref);
g_signal_connect (dialog, "response", G_CALLBACK (emfu_delete_response), NULL);
gtk_widget_show (dialog);