aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-folder-tree.c4
2 files changed, 12 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a5a277b527..af4484e795 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-31 Sankar P <psankar@novell.com>
+
+ ** Patch by Bharath Acharya <abharath@novell.com>
+
+ * em-folder-tree.c (emft_popup):
+ Disable delete and rename on
+ right click menu for the system folders
+
2008-10-22 Matthew Barnes <mbarnes@redhat.com>
* mail-send-recv.c:
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 8181c9a91a..ee2283f253 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2185,6 +2185,10 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
info_flags |= CAMEL_FOLDER_VIRTUAL | CAMEL_FOLDER_NOINFERIORS;
selfolder = em_folder_tree_get_selected_folder (emft);
+
+ if (folder_type_flags & CAMEL_FOLDER_SYSTEM)
+ flags &= ~EM_POPUP_FOLDER_DELETE;
+
if (em_utils_folder_is_outbox (selfolder, NULL))
info_flags |= CAMEL_FOLDER_TYPE_OUTBOX;
}