aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2008-10-31 19:22:44 +0800
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2008-10-31 19:22:44 +0800
commitafdd28115e288eacea31a12038ded6219c650047 (patch)
treee85fc65bb625c2a6c48b171b7fd176d166118ea7
parent727e1fdd3ee6fe457469fb30552571e2e0279746 (diff)
downloadgsoc2013-evolution-afdd28115e288eacea31a12038ded6219c650047.tar
gsoc2013-evolution-afdd28115e288eacea31a12038ded6219c650047.tar.gz
gsoc2013-evolution-afdd28115e288eacea31a12038ded6219c650047.tar.bz2
gsoc2013-evolution-afdd28115e288eacea31a12038ded6219c650047.tar.lz
gsoc2013-evolution-afdd28115e288eacea31a12038ded6219c650047.tar.xz
gsoc2013-evolution-afdd28115e288eacea31a12038ded6219c650047.tar.zst
gsoc2013-evolution-afdd28115e288eacea31a12038ded6219c650047.zip
Disable mail deletion and rename for system folders.
Disable mail deletion and rename for system folders. svn path=/branches/gnome-2-24/; revision=36704
-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 b73ca994a3..426d96e1e2 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 mail deletion and rename
+ for system folders.
+
2008-10-21 Sankar P <psankar@novell.com>
* em-folder-view.c (emfv_spin):
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;
}