From bafba91e9d2e3eca69f06713ae6162e537047cf1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Oct 2009 10:41:57 -0400 Subject: Bug 600019 - Menu glitches when an account name is selected --- mail/e-mail-reader.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'mail') diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 2f07a2795a..f6a3f99a26 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); -- cgit