[Xfce4-commits] <postler:master> Don't show Use As and Hide Folder for Inbox

[Christian Dywan]

Updating branch refs/heads/master
         to a72700d6936a6d661533c12db94a43b9c785b3a1 (commit)
       from dfbc6d8a4e801275ddbd8969ebcc4ae5dc6ce40f (commit)

commit a72700d6936a6d661533c12db94a43b9c785b3a1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Dec 21 22:51:45 2010 +0100

    Don't show Use As and Hide Folder for Inbox
    
    It doesn't make sense to switch the Inbox folder and it isn't
    helpful to hide it either.

 postler/postler-folders.vala |   76 ++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 24a9555..19b726a 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -431,23 +431,6 @@ public class Postler.Folders : Gtk.TreeView {
         menu.append (menuitem);
         menu.append (new Gtk.SeparatorMenuItem ());
 
-        menuitem = new Gtk.MenuItem.with_mnemonic (_("_Hide Folder"));
-        menuitem.activate.connect ((menuitem) => {
-             Gtk.TreeIter iter;
-             if (get_selection ().get_selected (null, out iter)) {
-                 string name;
-                 AccountInfo? account_info;
-                 store.get (iter,
-                     Columns.NAME, out name,
-                     Columns.INFO, out account_info);
-                 if (account_info != null) {
-                     account_info.hide += "," + name;
-                     accounts.update ();
-                     populate ();
-                 }
-             }
-        });
-        menu.append (menuitem);
         menuitem = new Gtk.MenuItem.with_mnemonic (_("_Import Archived Mailbox"));
         menuitem.activate.connect ((menuitem) => {
              Gtk.TreeIter iter;
@@ -462,23 +445,8 @@ public class Postler.Folders : Gtk.TreeView {
                  empty_folder (iter);
         });
         menu.append (menuitem);
-        
-        menuitem = new Gtk.MenuItem.with_mnemonic (_("_Use as..."));
-        var use_as_menu = new Gtk.Menu ();
-        for (int i = 0; i < FolderType.MAX; i++) {
-            var type = (FolderType)i;
-            var folder_item = new Gtk.ImageMenuItem.from_stock (
-                type.get_stock_id () ?? Gtk.STOCK_DIRECTORY, null);
-            folder_item.label = type.get_label ();
-            use_as_menu.append (folder_item);
-            folder_item.activate.connect ((folder_item) => {
-                Gtk.TreeIter iter;
-                if (get_selection ().get_selected (null, out iter))
-                    use_folder (iter, type);
-            });
-        }
-        menuitem.submenu = use_as_menu;
-        menu.append (menuitem);
+
+        menu.append (new Gtk.SeparatorMenuItem ());
 
         bool is_account = false;
         Gtk.TreeIter selected_iter;
@@ -487,8 +455,44 @@ public class Postler.Folders : Gtk.TreeView {
             if (!store.iter_parent (out iter, selected_iter))
                 is_account = true;
         }
-        if (is_account) {
-            menu.append (new Gtk.SeparatorMenuItem ());
+
+        if (!is_account) {
+            menuitem = new Gtk.MenuItem.with_mnemonic (_("_Use as..."));
+            var use_as_menu = new Gtk.Menu ();
+            for (int i = 1; i < FolderType.MAX; i++) {
+                var type = (FolderType)i;
+                var folder_item = new Gtk.ImageMenuItem.from_stock (
+                    type.get_stock_id () ?? Gtk.STOCK_DIRECTORY, null);
+                folder_item.label = type.get_label ();
+                use_as_menu.append (folder_item);
+                folder_item.activate.connect ((folder_item) => {
+                    Gtk.TreeIter iter;
+                   if (get_selection ().get_selected (null, out iter))
+                         use_folder (iter, type);
+                });
+            }
+            menuitem.submenu = use_as_menu;
+            menu.append (menuitem);
+
+            menuitem = new Gtk.MenuItem.with_mnemonic (_("_Hide Folder"));
+            menuitem.activate.connect ((menuitem) => {
+                 Gtk.TreeIter iter;
+                 if (get_selection ().get_selected (null, out iter)) {
+                     string name;
+                     AccountInfo? account_info;
+                     store.get (iter,
+                         Columns.NAME, out name,
+                         Columns.INFO, out account_info);
+                     if (account_info != null) {
+                         account_info.hide += "," + name;
+                         accounts.update ();
+                         populate ();
+                     }
+                 }
+            });
+            menu.append (menuitem);
+        }
+        else {
             menuitem = new Gtk.MenuItem.with_mnemonic (_("_Remove Account"));
             menuitem.activate.connect ((menuitem) => {
                 Gtk.TreeIter iter;