aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-08 08:32:51 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-08 08:32:51 +0800
commitb3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279 (patch)
tree4b2bf70af56c669cd65695c10ab7b71df5798173 /modules
parent77645577f5594d68e1a6d67d3a2edcf860a5f591 (diff)
downloadgsoc2013-evolution-b3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279.tar
gsoc2013-evolution-b3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279.tar.gz
gsoc2013-evolution-b3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279.tar.bz2
gsoc2013-evolution-b3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279.tar.lz
gsoc2013-evolution-b3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279.tar.xz
gsoc2013-evolution-b3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279.tar.zst
gsoc2013-evolution-b3c57ed8e5f1bcbda9ec0fa37a252aeb5313f279.zip
Bug 677624 - Disable Properties when Search Folders is selected
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-shell-view.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index cbcf24f31e..6efc54ba9d 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -836,7 +836,6 @@ mail_shell_view_update_actions (EShellView *shell_view)
gboolean folder_has_unread_rec = FALSE;
gboolean folder_tree_and_message_list_agree = TRUE;
gboolean store_is_subscribable;
- gboolean store_is_vstore = FALSE;
gboolean any_store_is_subscribable = FALSE;
/* Chain up to parent's update_actions() method. */
@@ -887,7 +886,6 @@ mail_shell_view_update_actions (EShellView *shell_view)
service = CAMEL_SERVICE (store);
uid = camel_service_get_uid (service);
source = e_source_registry_ref_source (registry, uid);
- store_is_vstore = g_strcmp0 (uid, E_MAIL_SESSION_VFOLDER_UID) == 0;
}
if (source != NULL) {
@@ -974,8 +972,9 @@ mail_shell_view_update_actions (EShellView *shell_view)
sensitive = folder_is_trash;
gtk_action_set_sensitive (action, sensitive);
+ /* folder_is_store + folder_is_virtual == "Search Folders" */
action = ACTION (MAIL_ACCOUNT_PROPERTIES);
- sensitive = (store != NULL) && folder_is_store;
+ sensitive = (store != NULL) && folder_is_store && !folder_is_virtual;
gtk_action_set_sensitive (action, sensitive);
action = ACTION (MAIL_FLUSH_OUTBOX);
@@ -1042,8 +1041,9 @@ mail_shell_view_update_actions (EShellView *shell_view)
sensitive = any_store_is_subscribable;
gtk_action_set_sensitive (action, sensitive);
+ /* folder_is_store + folder_is_virtual == "Search Folders" */
action = ACTION (MAIL_VFOLDER_UNMATCHED_ENABLE);
- gtk_action_set_visible (action, folder_is_store && store_is_vstore);
+ gtk_action_set_visible (action, folder_is_store && folder_is_virtual);
e_mail_shell_view_update_popup_labels (mail_shell_view);
}