From 8568b5f8318d1028616717f877b517ebd8cd4aa0 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 19 Nov 2008 07:55:14 +0000 Subject: [PATCH] 2008-11-19 [colin] 3.6.1cvs34 * src/folderview.c Always give focus to summaryview, even if the folder is empty, in small screen layout. Allows to go back to folderlist using the keyboard. --- ChangeLog | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 5 +++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94a8cd91a..2ed335f88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-11-19 [colin] 3.6.1cvs34 + + * src/folderview.c + Always give focus to summaryview, even if + the folder is empty, in small screen layout. + Allows to go back to folderlist using the + keyboard. + 2008-11-18 [colin] 3.6.1cvs33 * src/mainwindow.h diff --git a/PATCHSETS b/PATCHSETS index 77ebc1b76..d0dc2fc38 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3615,3 +3615,4 @@ ( cvs diff -u -r 1.382.2.483 -r 1.382.2.484 src/compose.c; ) > 3.6.1cvs31.patchset ( cvs diff -u -r 1.49.2.119 -r 1.49.2.120 src/procmime.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/w32_reg.c; ) > 3.6.1cvs32.patchset ( cvs diff -u -r 1.39.2.53 -r 1.39.2.54 src/mainwindow.h; ) > 3.6.1cvs33.patchset +( cvs diff -u -r 1.207.2.206 -r 1.207.2.207 src/folderview.c; ) > 3.6.1cvs34.patchset diff --git a/configure.ac b/configure.ac index ad4f78b48..f0bf849f6 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=33 +EXTRA_VERSION=34 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index 27f26ad11..c9546c178 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -889,8 +889,9 @@ static void folderview_select_node(FolderView *folderview, GtkCMCTreeNode *node) folderview->open_folder = TRUE; gtkut_ctree_set_focus_row(ctree, node); gtk_cmctree_select(ctree, node); - if (folderview->summaryview->folder_item && - folderview->summaryview->folder_item->total_msgs > 0) + if ((folderview->summaryview->folder_item && + folderview->summaryview->folder_item->total_msgs > 0) || + prefs_common.layout_mode == SMALL_LAYOUT) summary_grab_focus(folderview->summaryview); else gtk_widget_grab_focus(folderview->ctree); -- 2.25.1