diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2004-02-18 01:00:31 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-02-18 01:00:31 +0800 |
| commit | 0e572dcbe55f695ecbf05dccc5b525211e9a14b5 (patch) | |
| tree | b9b8b9e70921124d3ace72577a50de19c3749f09 | |
| parent | 671c73fac1d9a0101a2e83a8667945139287cd7e (diff) | |
| download | gsoc2013-evolution-0e572dcbe55f695ecbf05dccc5b525211e9a14b5.tar.gz gsoc2013-evolution-0e572dcbe55f695ecbf05dccc5b525211e9a14b5.tar.zst gsoc2013-evolution-0e572dcbe55f695ecbf05dccc5b525211e9a14b5.zip | |
Set the hide_deleted bool on EMFolderView.
2004-02-17 Jeffrey Stedfast <fejj@ximian.com>
* em-folder-browser.c (emfb_hide_deleted): Set the hide_deleted
bool on EMFolderView.
* em-folder-view.c (emfv_popup_delete): Fix Sarfraaz Ahmed's fix
to only jump to the previous message if hide_deleted is
set. Otherwise his fix gets extremely irritating.
(emfv_list_key_press): Same.
svn path=/trunk/; revision=24762
| -rw-r--r-- | mail/ChangeLog | 18 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 4 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 6 |
3 files changed, 20 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8e7054c5c7..c62d07986b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2004-02-17 Jeffrey Stedfast <fejj@ximian.com> + + * em-folder-browser.c (emfb_hide_deleted): Set the hide_deleted + bool on EMFolderView. + + * em-folder-view.c (emfv_popup_delete): Fix Sarfraaz Ahmed's fix + to only jump to the previous message if hide_deleted is + set. Otherwise his fix gets extremely irritating. + (emfv_list_key_press): Same. + 2004-02-17 Not Zed <NotZed@Ximian.com> ** See bug #53914. @@ -37,11 +47,11 @@ width/height 2004-02-13 Sarfraaz Ahmed <asarfraaz@novell.com> - + * em-folder-view.c (emfv_popup_delete): added the code to get - the previous mail in a list, if get_next_mail fails. This is a - fix for #54195 - (emfv_list_key_press): Same as above + the previous mail in a list, if get_next_mail fails. This is a + fix for #54195 + (emfv_list_key_press): Same as above 2004-02-13 Not Zed <NotZed@Ximian.com> diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 09d2a9b45e..2a17a3417c 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -733,8 +733,10 @@ emfb_hide_deleted(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_E gconf = mail_config_get_gconf_client (); gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_deleted", state[0] == '0', NULL); - if (!(emfv->folder && (emfv->folder->folder_flags & CAMEL_FOLDER_IS_TRASH))) + if (!(emfv->folder && (emfv->folder->folder_flags & CAMEL_FOLDER_IS_TRASH))) { message_list_set_hidedeleted(emfv->list, state[0] != '0'); + emfv->hide_deleted = state[0] != '0'; + } } static void diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 0bad8e0221..bec6164409 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -612,8 +612,8 @@ emfv_popup_delete(GtkWidget *w, EMFolderView *emfv) em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED); if (uids->len == 1) { - if (!message_list_select(emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE)) - message_list_select(emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0, FALSE); + if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE) && emfv->hide_deleted) + message_list_select (emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0, FALSE); } em_utils_uids_free(uids); } @@ -1835,7 +1835,7 @@ emfv_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, else emfv_popup_delete(NULL, emfv); - if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE)) + if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE) && emfv->hide_deleted) message_list_select (emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0, FALSE); break; case GDK_Menu: |