diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
| commit | c9ec8c3f4dce2b02c91268529977770364ef87fe (patch) | |
| tree | d574f2be1b5438407e59e2fead1321766c9bbc83 /mail/e-mail-reader.c | |
| parent | 6fec6bf39467dd32625847be1b021a7e5bc94d76 (diff) | |
| parent | 96538878911586a9e9ca26b81e1916c04e538980 (diff) | |
| download | gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.gz gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.zst gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.zip | |
Merge branch 'express2'
Diffstat (limited to 'mail/e-mail-reader.c')
| -rw-r--r-- | mail/e-mail-reader.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index ac36600725..4b02d69623 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1288,8 +1288,8 @@ static GtkActionEntry mail_reader_entries[] = { N_("Mark the selected messages as junk"), G_CALLBACK (action_mail_mark_junk_cb) }, - { "mail-mark-notjunk", - "mail-mark-notjunk", + { "mail-mark-not-junk", + "mail-mark-not-junk", N_("_Not Junk"), "<Shift><Control>j", N_("Mark the selected messages as not being junk"), @@ -1598,9 +1598,9 @@ static EPopupActionEntry mail_reader_popup_entries[] = { N_("Mark as _Junk"), "mail-mark-junk" }, - { "mail-popup-mark-notjunk", + { "mail-popup-mark-not-junk", N_("Mark as _Not Junk"), - "mail-mark-notjunk" }, + "mail-mark-not-junk" }, { "mail-popup-mark-read", N_("Mar_k as Read"), @@ -2303,11 +2303,13 @@ mail_reader_update_actions (EMailReader *reader) gtk_action_set_sensitive (action, sensitive); action_name = "mail-mark-junk"; - sensitive = selection_has_not_junk_messages; + sensitive = + selection_has_not_junk_messages && + !(state & E_MAIL_READER_FOLDER_IS_JUNK); action = e_mail_reader_get_action (reader, action_name); gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK)); - action_name = "mail-mark-notjunk"; + action_name = "mail-mark-not-junk"; sensitive = selection_has_junk_messages; action = e_mail_reader_get_action (reader, action_name); gtk_action_set_sensitive (action, sensitive); |