[evolution] Bug 600019 - Menu glitches when an account name is selected
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Bug 600019 - Menu glitches when an account name is selected
- Date: Thu, 29 Oct 2009 14:42:25 +0000 (UTC)
commit bafba91e9d2e3eca69f06713ae6162e537047cf1
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Oct 29 10:41:57 2009 -0400
Bug 600019 - Menu glitches when an account name is selected
mail/e-mail-reader.c | 40 ++++++++++++++++++++++++++++++++++++++
modules/mail/e-mail-shell-view.c | 12 +++++++++++
2 files changed, 52 insertions(+), 0 deletions(-)
---
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 2f07a27..f6a3f99 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2038,6 +2038,11 @@ mail_reader_update_actions (EMailReader *reader)
any_messages_selected =
(single_message_selected || multiple_messages_selected);
+ action_name = "mail-add-sender";
+ sensitive = single_message_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-check-for-junk";
sensitive = any_messages_selected;
action = e_mail_reader_get_action (reader, action_name);
@@ -2048,6 +2053,11 @@ mail_reader_update_actions (EMailReader *reader)
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
+ action_name = "mail-create-rule-menu";
+ sensitive = single_message_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-delete";
sensitive = selection_has_undeleted_messages;
action = e_mail_reader_get_action (reader, action_name);
@@ -2058,6 +2068,11 @@ mail_reader_update_actions (EMailReader *reader)
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
+ action_name = "mail-find";
+ sensitive = single_message_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-forward";
sensitive = have_an_account && any_messages_selected;
action = e_mail_reader_get_action (reader, action_name);
@@ -2073,6 +2088,11 @@ mail_reader_update_actions (EMailReader *reader)
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
+ action_name = "mail-forward-as-menu";
+ sensitive = have_an_account && any_messages_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-forward-inline";
sensitive = have_an_account && single_message_selected;
action = e_mail_reader_get_action (reader, action_name);
@@ -2093,11 +2113,21 @@ mail_reader_update_actions (EMailReader *reader)
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
+ action_name = "mail-goto-menu";
+ sensitive = any_messages_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-load-images";
sensitive = single_message_selected;
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
+ action_name = "mail-mark-as-menu";
+ sensitive = any_messages_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-mark-important";
sensitive = selection_has_unimportant_messages;
action = e_mail_reader_get_action (reader, action_name);
@@ -2148,6 +2178,11 @@ mail_reader_update_actions (EMailReader *reader)
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
+ action_name = "mail-next";
+ sensitive = any_messages_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-next-important";
sensitive = single_message_selected;
action = e_mail_reader_get_action (reader, action_name);
@@ -2163,6 +2198,11 @@ mail_reader_update_actions (EMailReader *reader)
action = e_mail_reader_get_action (reader, action_name);
gtk_action_set_sensitive (action, sensitive);
+ action_name = "mail-previous";
+ sensitive = any_messages_selected;
+ action = e_mail_reader_get_action (reader, action_name);
+ gtk_action_set_sensitive (action, sensitive);
+
action_name = "mail-previous-important";
sensitive = single_message_selected;
action = e_mail_reader_get_action (reader, action_name);
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 7ce6833..346d0fe 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -536,6 +536,18 @@ mail_shell_view_update_actions (EShellView *shell_view)
folder_tree_and_message_list_agree;
gtk_action_set_sensitive (action, sensitive);
+ action = ACTION (MAIL_FOLDER_SELECT_ALL);
+ sensitive = !folder_is_store;
+ gtk_action_set_sensitive (action, sensitive);
+
+ action = ACTION (MAIL_FOLDER_SELECT_THREAD);
+ sensitive = !folder_is_store;
+ gtk_action_set_sensitive (action, sensitive);
+
+ action = ACTION (MAIL_FOLDER_SELECT_SUBTHREAD);
+ sensitive = !folder_is_store;
+ gtk_action_set_sensitive (action, sensitive);
+
action = ACTION (MAIL_FOLDER_UNSUBSCRIBE);
sensitive = !folder_is_store && folder_can_be_deleted;
gtk_action_set_sensitive (action, sensitive);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]