From e9ea8a567cc85027ef7dcef7ba3ad03044677793 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 22 Apr 2010 18:28:17 -0400 Subject: Work around another dropped gnome-icon-theme icon. mail-mark-notjunk -> mail-mark-not-junk --- mail/e-mail-reader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mail/e-mail-reader.c') diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index d238d500a9..8adc94536e 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1292,8 +1292,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"), "j", N_("Mark the selected messages as not being junk"), @@ -1602,9 +1602,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"), @@ -2316,7 +2316,7 @@ mail_reader_update_actions (EMailReader *reader) action = e_mail_reader_get_action (reader, action_name); gtk_action_set_sensitive (action, sensitive); - 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); -- cgit v1.2.3 From be8c081a728fe8a1e97e615f443dccb5f824b19f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Apr 2010 21:08:09 -0400 Subject: Revert "Work around another dropped gnome-icon-theme icon." This reverts commit edf6286a38279e6db82dee4da50e94c587f06e02. gnome-icon-theme got it wrong, not us. See bug #616954. --- mail/e-mail-reader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mail/e-mail-reader.c') diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 8adc94536e..d238d500a9 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1292,8 +1292,8 @@ static GtkActionEntry mail_reader_entries[] = { N_("Mark the selected messages as junk"), G_CALLBACK (action_mail_mark_junk_cb) }, - { "mail-mark-not-junk", - "mail-mark-not-junk", + { "mail-mark-notjunk", + "mail-mark-notjunk", N_("_Not Junk"), "j", N_("Mark the selected messages as not being junk"), @@ -1602,9 +1602,9 @@ static EPopupActionEntry mail_reader_popup_entries[] = { N_("Mark as _Junk"), "mail-mark-junk" }, - { "mail-popup-mark-not-junk", + { "mail-popup-mark-notjunk", N_("Mark as _Not Junk"), - "mail-mark-not-junk" }, + "mail-mark-notjunk" }, { "mail-popup-mark-read", N_("Mar_k as Read"), @@ -2316,7 +2316,7 @@ mail_reader_update_actions (EMailReader *reader) action = e_mail_reader_get_action (reader, action_name); gtk_action_set_sensitive (action, sensitive); - action_name = "mail-mark-not-junk"; + action_name = "mail-mark-notjunk"; sensitive = selection_has_junk_messages; action = e_mail_reader_get_action (reader, action_name); gtk_action_set_sensitive (action, sensitive); -- cgit v1.2.3 From 0fb409b6c5c18c43b49bf18f4a52c9883f6e2ab2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 May 2010 21:39:09 +0200 Subject: Bug #611560 - 'Mark as junk' should be disabled in junk folder --- mail/e-mail-reader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mail/e-mail-reader.c') diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index d238d500a9..53d45fd2e5 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -2314,7 +2314,7 @@ mail_reader_update_actions (EMailReader *reader) action_name = "mail-mark-junk"; sensitive = selection_has_not_junk_messages; action = e_mail_reader_get_action (reader, action_name); - gtk_action_set_sensitive (action, sensitive); + gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK)); action_name = "mail-mark-notjunk"; sensitive = selection_has_junk_messages; @@ -2758,6 +2758,7 @@ e_mail_reader_check_state (EMailReader *reader) gboolean drafts_or_outbox; gboolean store_supports_vjunk = FALSE; gboolean is_mailing_list; + gboolean is_junk_folder = FALSE; guint32 state = 0; guint ii; @@ -2770,6 +2771,7 @@ e_mail_reader_check_state (EMailReader *reader) if (folder != NULL) { store = CAMEL_STORE (folder->parent_store); store_supports_vjunk = (store->flags & CAMEL_STORE_VJUNK); + is_junk_folder = (folder->folder_flags & CAMEL_FOLDER_IS_JUNK) != 0; } drafts_or_outbox = @@ -2885,6 +2887,8 @@ e_mail_reader_check_state (EMailReader *reader) state |= E_MAIL_READER_SELECTION_HAS_UNREAD; if (is_mailing_list) state |= E_MAIL_READER_SELECTION_IS_MAILING_LIST; + if (is_junk_folder) + state |= E_MAIL_READER_FOLDER_IS_JUNK; em_utils_uids_free (uids); -- cgit v1.2.3