diff options
| -rw-r--r-- | mail/ChangeLog | 18 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 17 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 4 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 2 | ||||
| -rw-r--r-- | mail/evolution-mail.schemas.in.in | 2 | ||||
| -rw-r--r-- | mail/mail-config.c | 12 | ||||
| -rw-r--r-- | mail/mail.error.xml | 7 |
7 files changed, 45 insertions, 17 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f7968aee9b..f12505ad96 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,21 @@ +2006-02-06 Srinivasa Ragavan <sragavan@novell.com> + + ** Fixes bug #328651 + + * em-folder-view.c: + * em-format-html-display.c: + * evolution-mail.schemas.in.in: + * mail-config.c: (config_cache_labels): + +2006-01-27 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> + + ** Fixes bug #325786 + + * em-folder-browser.c: Added code to display a prompt before marking All + messages as Read. + * mail-error.xml: Added a new error message for marking all message as + read. + 2006-02-06 Veerapuram Varadhan <vvaradhan@novell.com> ** Fixes #326147 diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index fd627e6820..04a209a5fe 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -75,6 +75,7 @@ #include <camel/camel-search-private.h> #include "e-util/e-dialog-utils.h" +#include "e-util/e-error.h" #include "e-util/e-util-private.h" #include "em-utils.h" #include "em-composer-utils.h" @@ -727,13 +728,15 @@ emfb_mark_all_read(BonoboUIComponent *uid, void *data, const char *path) if (emfv->folder == NULL) return; - - uids = message_list_get_uids(emfv->list); - camel_folder_freeze(emfv->folder); - for (i=0;i<uids->len;i++) - camel_folder_set_message_flags(emfv->folder, uids->pdata[i], CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); - camel_folder_thaw(emfv->folder); - message_list_free_uids(emfv->list, uids); + + if( e_error_run ((GtkWidget *)emfv,"mail:ask-mark-all-read",NULL) == GTK_RESPONSE_YES){ + uids = message_list_get_uids(emfv->list); + camel_folder_freeze(emfv->folder); + for (i=0;i<uids->len;i++) + camel_folder_set_message_flags(emfv->folder, uids->pdata[i], CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); + camel_folder_thaw(emfv->folder); + message_list_free_uids(emfv->list, uids); + } } static void diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 50b03d4fb1..e0a79138a9 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1102,8 +1102,8 @@ static EPopupItem emfv_popup_items[] = { { E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "stock_not-spam", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK }, { E_POPUP_ITEM, "50.emfv.06", N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, "stock_mail-flag-for-followup", EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_SUBMENU, "60.label.00", N_("Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "60.label.00/00.label", N_("None"), emfv_popup_label_clear, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_SUBMENU, "60.label.00", N_("_Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, "60.label.00/00.label", N_("_None"), emfv_popup_label_clear, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_BAR, "60.label.00/00.label.00", NULL, NULL, NULL, NULL }, { E_POPUP_BAR, "70.emfv.06", NULL, NULL, NULL, NULL }, diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 7e4d5c19af..28ba04b6dd 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -1914,7 +1914,7 @@ efhd_bar_save_selected(EPopup *ep, EPopupItem *item, void *data) static EPopupItem efhd_bar_menu_items[] = { { E_POPUP_BAR, "05.display", }, - { E_POPUP_ITEM, "05.display.01", N_("Save Selected..."), efhd_bar_save_selected, NULL, NULL, EM_POPUP_ATTACHMENTS_MULTIPLE}, + { E_POPUP_ITEM, "05.display.01", N_("_Save Selected..."), efhd_bar_save_selected, NULL, NULL, EM_POPUP_ATTACHMENTS_MULTIPLE}, }; static gboolean diff --git a/mail/evolution-mail.schemas.in.in b/mail/evolution-mail.schemas.in.in index 21db0e7696..0c0d3f3bf4 100644 --- a/mail/evolution-mail.schemas.in.in +++ b/mail/evolution-mail.schemas.in.in @@ -713,7 +713,7 @@ <owner>evolution-mail</owner> <type>list</type> <list_type>string</list_type> - <default>[Important:#ff0000,Work:#ff8c00,Personal:#008b00,To Do:#0000ff,Later:#8b008b]</default> + <default>[I_mportant:#ff0000,_Work:#ff8c00,_Personal:#008b00,)To Do:#0000ff,_Later:#8b008b]</default> <locale name="C"> <short>List of Labels and their associated colors</short> <long> diff --git a/mail/mail-config.c b/mail/mail-config.c index ec2b1b016d..65223f81a8 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -82,11 +82,11 @@ /* Note, the first element of each MailConfigLabel must NOT be translated */ MailConfigLabel label_defaults[5] = { - { "important", N_("Important"), "#ff0000" }, /* red */ - { "work", N_("Work"), "#ff8c00" }, /* orange */ - { "personal", N_("Personal"), "#008b00" }, /* forest green */ - { "todo", N_("To Do"), "#0000ff" }, /* blue */ - { "later", N_("Later"), "#8b008b" } /* magenta */ + { "important", N_("I_mportant"), "#ff0000" }, /* red */ + { "work", N_("_Work"), "#ff8c00" }, /* orange */ + { "personal", N_("_Personal"), "#008b00" }, /* forest green */ + { "todo", N_("_To Do"), "#0000ff" }, /* blue */ + { "later", N_("_Later"), "#8b008b" } /* magenta */ }; typedef struct { @@ -170,7 +170,7 @@ config_cache_labels (void) *colour++ = '\0'; label->tag = g_strdup(label_defaults[num].tag); - label->name = g_strdup (buf); + label->name = g_strdup (_(buf)); label->colour = g_strdup (colour); n = g_slist_alloc (); diff --git a/mail/mail.error.xml b/mail/mail.error.xml index 56b1ba6cc9..539da60506 100644 --- a/mail/mail.error.xml +++ b/mail/mail.error.xml @@ -376,6 +376,13 @@ You can choose to ignore this folder, overwrite or append its contents, or quit. <button stock="gtk-yes" response="GTK_RESPONSE_YES"/> </error> + <error id="ask-mark-all-read" type="question" default="GTK_RESPONSE_NO"> + <_title>Mark all messages as read</_title> + <_primary>Do you want to mark all the message as read?</_primary> + <_secondary xml:space="preserve">This will mark all the messages as read in the selected folder and its sub folders.</_secondary> + <button stock="gtk-no" response="GTK_RESPONSE_NO"/> + <button stock="gtk-yes" response="GTK_RESPONSE_YES"/> + </error> <error id="signature-already-exists" type="error" modal="true"> <_primary>Signature Already Exists</_primary> |