diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-04-23 06:28:17 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-30 00:40:23 +0800 |
| commit | 43e2c871a418b560b391af00df2b10896055026c (patch) | |
| tree | 218783c19fa833049221fcfd237ee5fcc9fa39e7 | |
| parent | df6e11c04e896cedc996696beadfdf4c4fb705eb (diff) | |
| download | gsoc2013-evolution-43e2c871a418b560b391af00df2b10896055026c.tar.gz gsoc2013-evolution-43e2c871a418b560b391af00df2b10896055026c.tar.zst gsoc2013-evolution-43e2c871a418b560b391af00df2b10896055026c.zip | |
Work around another dropped gnome-icon-theme icon.
mail-mark-notjunk -> mail-mark-not-junk
| -rw-r--r-- | mail/e-mail-reader.c | 10 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 2 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.h | 4 | ||||
| -rw-r--r-- | ui/evolution-mail-reader.ui | 4 | ||||
| -rw-r--r-- | ui/evolution-mail.ui | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 684b97c085..b5bcd15b37 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"), "<Shift><Control>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"), @@ -2302,7 +2302,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); diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 732b65060f..efd3f64d02 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -1223,7 +1223,7 @@ static GtkRadioActionEntry mail_filter_entries[] = { MAIL_FILTER_LAST_5_DAYS_MESSAGES }, { "mail-filter-messages-not-junk", - "mail-mark-notjunk", + "mail-mark-not-junk", N_("Messages Not Junk"), NULL, NULL, /* XXX Add a tooltip! */ diff --git a/modules/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h index eb11f46013..addd67452b 100644 --- a/modules/mail/e-mail-shell-view-actions.h +++ b/modules/mail/e-mail-shell-view-actions.h @@ -115,8 +115,8 @@ E_SHELL_WINDOW_ACTION ((window), "mail-mark-important") #define E_SHELL_WINDOW_ACTION_MAIL_MARK_JUNK(window) \ E_SHELL_WINDOW_ACTION ((window), "mail-mark-junk") -#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOTJUNK(window) \ - E_SHELL_WINDOW_ACTION ((window), "mail-mark-notjunk") +#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOT_JUNK(window) \ + E_SHELL_WINDOW_ACTION ((window), "mail-mark-not-junk") #define E_SHELL_WINDOW_ACTION_MAIL_MARK_READ(window) \ E_SHELL_WINDOW_ACTION ((window), "mail-mark-read") #define E_SHELL_WINDOW_ACTION_MAIL_MARK_UNIMPORTANT(window) \ diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui index ad0b401676..53cb8845d3 100644 --- a/ui/evolution-mail-reader.ui +++ b/ui/evolution-mail-reader.ui @@ -82,7 +82,7 @@ <menuitem action="mail-mark-unimportant"/> <separator/> <menuitem action="mail-mark-junk"/> - <menuitem action="mail-mark-notjunk"/> + <menuitem action="mail-mark-not-junk"/> <separator/> <menuitem action="mail-flag-for-followup"/> <menuitem action="mail-flag-clear"/> @@ -127,7 +127,7 @@ #endif <toolitem action='mail-delete'/> <toolitem action='mail-mark-junk'/> - <toolitem action='mail-mark-notjunk'/> + <toolitem action='mail-mark-not-junk'/> </placeholder> <separator/> <placeholder name='mail-toolbar-navigation'> diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui index d0c305197a..bae4b26fe2 100644 --- a/ui/evolution-mail.ui +++ b/ui/evolution-mail.ui @@ -111,7 +111,7 @@ <menuitem action='mail-popup-mark-important'/> <menuitem action='mail-popup-mark-unimportant'/> <menuitem action='mail-popup-mark-junk'/> - <menuitem action='mail-popup-mark-notjunk'/> + <menuitem action='mail-popup-mark-not-junk'/> <menuitem action='mail-popup-flag-for-followup'/> <menuitem action="mail-popup-flag-clear"/> <menuitem action="mail-popup-flag-completed"/> |