diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-12-05 02:32:25 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-12-05 02:33:29 +0800 |
| commit | ae6344a22b041577fdab9bf3866dbfe779dc1409 (patch) | |
| tree | a2c0a2fe4d684cd8609f83c4619a50997a7421a6 /mail | |
| parent | 56975aec6a4904140df94361ff9c4bbca5b1dc95 (diff) | |
| download | gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar.gz gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.tar.zst gsoc2013-evolution-ae6344a22b041577fdab9bf3866dbfe779dc1409.zip | |
Bug #315317 - Add option to expunge messages on folder leave
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-reader.c | 4 | ||||
| -rw-r--r-- | mail/mail-config.ui | 4 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index cc96053198..923b3d403c 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -3076,7 +3076,7 @@ mail_reader_set_folder (EMailReader *reader, (CAMEL_IS_VEE_FOLDER (previous_folder) || e_shell_get_online (shell)); if (sync_folder) - mail_sync_folder (previous_folder, NULL, NULL); + mail_sync_folder (previous_folder, TRUE, NULL, NULL); /* Skip the rest if we're already viewing the folder. */ if (folder == previous_folder) @@ -3094,7 +3094,7 @@ mail_reader_set_folder (EMailReader *reader, /* this is to make sure any post-poned changes in Search Folders * will be propagated on folder selection */ if (folder && CAMEL_IS_VEE_FOLDER (folder)) - mail_sync_folder (folder, NULL, NULL); + mail_sync_folder (folder, FALSE, NULL, NULL); message_list_set_folder ( MESSAGE_LIST (message_list), folder, outgoing); diff --git a/mail/mail-config.ui b/mail/mail-config.ui index cef8453de7..162cdd4dd7 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2047,7 +2047,7 @@ <property name="spacing">4</property> <child> <object class="GtkCheckButton" id="chkEmptyTrashOnExit"> - <property name="label" translatable="yes">Empty trash folders on e_xit</property> + <property name="label" translatable="yes">Empty _trash folders</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -2766,7 +2766,7 @@ <property name="spacing">4</property> <child> <object class="GtkCheckButton" id="junk_empty_check"> - <property name="label" translatable="yes">Delete junk messages on e_xit</property> + <property name="label" translatable="yes">_Delete junk messages</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 3118bf7a72..e5001157a8 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -144,7 +144,7 @@ static void free_folder_info (struct _folder_info *info) { /*camel_folder_thaw (info->folder); */ - mail_sync_folder (info->folder, NULL, NULL); + mail_sync_folder (info->folder, FALSE, NULL, NULL); g_object_unref (info->folder); g_free (info->uri); g_free (info); @@ -215,7 +215,7 @@ free_send_data (void) g_return_if_fail (g_hash_table_size (data->active) == 0); if (data->inbox) { - mail_sync_folder (data->inbox, NULL, NULL); + mail_sync_folder (data->inbox, FALSE, NULL, NULL); /*camel_folder_thaw (data->inbox); */ g_object_unref (data->inbox); } |