2005-04-03 [colin] 1.9.6cvs23

	* src/summaryview.c
		Don't handle up/down. Patch by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 5f22457ded700773892dbf28bb8f3e1dddbf5cad..6dea0419a9d1231b5e3bd23fc12861c08097f359 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-04-03 [colin]     1.9.6cvs23
+
+       * src/summaryview.c
+               Don't handle up/down. Patch by Alfons
+

 2005-04-02 [colin]     1.9.6cvs22
 
        * src/summaryview.c
 2005-04-02 [colin]     1.9.6cvs22
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 5e5de5c6794d7e92dd6dc6ab938320092f7908a9..e8ef54b669db52b66551928ce0d96085f807213b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -439,3 +439,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/image_viewer.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/image_viewer.h; cvs diff -u -r 1.49.2.37 -r 1.49.2.38 src/procmime.c; cvs diff -u -r 1.17.2.8 -r 1.17.2.9 src/procmime.h; cvs diff -u -r 1.96.2.51 -r 1.96.2.52 src/textview.c; cvs diff -u -r 1.12.2.4 -r 1.12.2.5 src/textview.h; ) > 1.9.6cvs20.patchset
 ( cvs diff -u -r 1.155.2.20 -r 1.155.2.21 src/Makefile.am; cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/stock_pixmap.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/dir-noselect.xpm; cvs diff -u -r 0 -r 1 src/pixmaps/dir_noselect.xpm; ) > 1.9.6cvs21.patchset
 ( cvs diff -u -r 1.395.2.63 -r 1.395.2.64 src/summaryview.c; ) > 1.9.6cvs22.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/image_viewer.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/image_viewer.h; cvs diff -u -r 1.49.2.37 -r 1.49.2.38 src/procmime.c; cvs diff -u -r 1.17.2.8 -r 1.17.2.9 src/procmime.h; cvs diff -u -r 1.96.2.51 -r 1.96.2.52 src/textview.c; cvs diff -u -r 1.12.2.4 -r 1.12.2.5 src/textview.h; ) > 1.9.6cvs20.patchset
 ( cvs diff -u -r 1.155.2.20 -r 1.155.2.21 src/Makefile.am; cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/stock_pixmap.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/dir-noselect.xpm; cvs diff -u -r 0 -r 1 src/pixmaps/dir_noselect.xpm; ) > 1.9.6cvs21.patchset
 ( cvs diff -u -r 1.395.2.63 -r 1.395.2.64 src/summaryview.c; ) > 1.9.6cvs22.patchset

+( cvs diff -u -r 1.395.2.64 -r 1.395.2.65 src/summaryview.c; ) > 1.9.6cvs23.patchset

diff --git a/configure.ac b/configure.ac
index 308dbe438311bca58013a1c7c844a8a264f20b40..b4df507ef995aafb6e969f62ddc7e628ec014ff6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=22
+EXTRA_VERSION=23

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 5711e3e3c800de165b0af7a6eae5407e830c0813..72eeb7a7c06ede52d1ce05cf8f6f4a890f194df9 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4436,27 +4436,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return TRUE;
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return TRUE;

-       case GDK_Up:
-       case GDK_Down:
-               if ((node = summaryview->selected) != NULL) {
-                       GtkCTreeNode *next = NULL;
-                       do {
-                               next = (event->keyval == GDK_Down)
-                                       ? gtkut_ctree_node_next(ctree, next ? next:node)
-                                       : gtkut_ctree_node_prev(ctree, next ? next:node);
-                       } while (next && !gtk_ctree_is_viewable(ctree, next));
-
-                       if (next) {
-                               gtk_sctree_select_with_state
-                                       (GTK_SCTREE(ctree), next, event->state);
-                               
-                               /* Deprecated - what are the non-deprecated equivalents? */
-                               if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
-                                       gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
-                               summaryview->selected = next;
-                       }
-               }
-               return TRUE;

        case GDK_Home:
        case GDK_End:
                if ((node = summaryview->selected) != NULL) {
        case GDK_Home:
        case GDK_End:
                if ((node = summaryview->selected) != NULL) {