2007-04-24 [colin] 2.9.1cvs23

	* src/folderview.c
		Fix bug 1195, 'Hardware key navigation'
		Make GDK_Enter toggle expansion (Maemo)

diff --git a/ChangeLog b/ChangeLog
index 4b4b5f5e4cd07b7e3cfbb95513aeec30b5d365a3..ee87e64cdd9de7943071024da861b222c93b4901 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-24 [colin]     2.9.1cvs23
+
+       * src/folderview.c
+               Fix bug 1195, 'Hardware key navigation' 
+               Make GDK_Enter toggle expansion (Maemo)
+
 2007-04-24 [wwp]       2.9.1cvs22
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 43a4738df7e2f9f4812f2dc5ea23f95386fcd1d0..715d23873e9c3647b0a011862da41de517672f1c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2550,3 +2550,4 @@
 ( cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/about.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/active.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_off.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_on.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/inactive.xpm;  ) > 2.9.1cvs20.patchset
 ( cvs diff -u -r 1.155.2.62 -r 1.155.2.63 src/Makefile.am;  cvs diff -u -r 1.25.2.37 -r 1.25.2.38 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.26 -r 1.18.2.27 src/stock_pixmap.h;  ) > 2.9.1cvs21.patchset
 ( cvs diff -u -r 1.382.2.373 -r 1.382.2.374 src/compose.c;  ) > 2.9.1cvs22.patchset
+( cvs diff -u -r 1.207.2.161 -r 1.207.2.162 src/folderview.c;  ) > 2.9.1cvs23.patchset

diff --git a/configure.ac b/configure.ac
index a6a82120ba85e012354ffd1c8984d0b0ec5d5965..088c8db6febf332a315db078684dd1b5c943d6b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index b36872237478b52af2917b3e907efbb4b1c5b15a..ddc831dadbd74b27df0f7c70af8b66173f0652d2 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2005,12 +2005,23 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_Right:
+#ifndef MAEMO
        case GDK_Return:
+#endif
                if (folderview->selected) {
                        folderview_select_node(folderview,
                                               folderview->selected);
                }
                break;
+#ifdef MAEMO
+       case GDK_Return:
+               if (folderview->selected && GTK_CTREE_ROW(folderview->selected)->children) {
+                       gtk_ctree_toggle_expansion(
+                               GTK_CTREE(folderview->ctree),
+                               folderview->selected);
+               }
+               break;  
+#endif
        case GDK_space:
                if (folderview->selected) {
                        if (folderview->opened == folderview->selected &&