[Xfce4-commits] <postler:master> Don't show Empty Folder or Import Mailbox on search

[Christian Dywan]

Updating branch refs/heads/master
         to 9dec37519422d6d9adf612aee0682c806a579c0a (commit)
       from 81e68a9e4aa9605bbeb9325a329614957baa655e (commit)

commit 9dec37519422d6d9adf612aee0682c806a579c0a
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Jan 28 00:49:26 2011 +0100

    Don't show Empty Folder or Import Mailbox on search

 postler/postler-folders.vala |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 8038e35..111d313 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -550,25 +550,10 @@ public class Postler.Folders : Gtk.TreeView {
              }
         });
         menu.append (menuitem);
-        menu.append (new Gtk.SeparatorMenuItem ());
-
-        menuitem = new Gtk.MenuItem.with_mnemonic (_("_Import Archived Mailbox"));
-        menuitem.activate.connect ((menuitem) => {
-             Gtk.TreeIter iter;
-             if (get_selection ().get_selected (null, out iter))
-                 import_folder (iter);
-        });
-        menu.append (menuitem);
-        menuitem = new Gtk.MenuItem.with_mnemonic (_("_Empty Folder"));
-        menuitem.activate.connect ((menuitem) => {
-             Gtk.TreeIter iter;
-             if (get_selection ().get_selected (null, out iter))
-                 empty_folder (iter);
-        });
-        menu.append (menuitem);
 
         bool is_account = false;
         bool is_local = false;
+        bool is_search = false;
         Gtk.TreeIter selected_iter;
         if (get_selection ().get_selected (null, out selected_iter)) {
             Gtk.TreeIter iter;
@@ -578,6 +563,26 @@ public class Postler.Folders : Gtk.TreeView {
             AccountInfo? account_info;
             store.get (selected_iter, Columns.INFO, out account_info);
             is_local = account_info == local_info;
+            is_search = account_info.type == AccountType.SEARCH;
+        }
+
+        if (!is_search) {
+            menu.append (new Gtk.SeparatorMenuItem ());
+
+            menuitem = new Gtk.MenuItem.with_mnemonic (_("_Import Archived Mailbox"));
+            menuitem.activate.connect ((menuitem) => {
+                 Gtk.TreeIter iter;
+                 if (get_selection ().get_selected (null, out iter))
+                     import_folder (iter);
+            });
+            menu.append (menuitem);
+            menuitem = new Gtk.MenuItem.with_mnemonic (_("_Empty Folder"));
+            menuitem.activate.connect ((menuitem) => {
+                 Gtk.TreeIter iter;
+                 if (get_selection ().get_selected (null, out iter))
+                     empty_folder (iter);
+            });
+            menu.append (menuitem);
         }
 
         if (!is_account && !is_local) {