talons

commit 09887b64e97b9b34d32bdfadf7e9c51e4e4f2431
parent 1d473cbc5d0688ec2c46b8505dc4d9e6d13dd1df
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Sun, 31 Jan 2010 14:19:44 +0000

2010-01-31 [pawel]	3.7.5cvs1

	* src/messageview.c
	* src/mimeview.c
		Fix Bug 2107 - Arrow keys don't work in message view window

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
4
+++-
M
src/mimeview.c
 | 
15
+++++++++++----

5 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-31 [pawel]	3.7.5cvs1
+
+	* src/messageview.c
+	* src/mimeview.c
+		Fix Bug 2107 - Arrow keys don't work in message view window
+
 2010-01-31 [paul]	3.7.5
 
 	* NEWS
diff --git a/PATCHSETS b/PATCHSETS
@@ -3941,3 +3941,4 @@
 ( cvs diff -u -r 1.105.2.156 -r 1.105.2.157 src/prefs_account.c;  cvs diff -u -r 1.59.2.80 -r 1.59.2.81 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_send.c;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/gtk/colorlabel.c;  ) > 3.7.4cvs8.patchset
 ( cvs diff -u -r 1.1.2.38 -r 1.1.2.39 commitHelper;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 tools/kdeservicemenu/install.sh;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 tools/make.themes.project;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/nautilus2claws-mail.sh;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/popfile-link.sh;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 tools/textviewer.sh;  ) > 3.7.4cvs9.patchset
 ( cvs diff -u -r 1.60.2.135 -r 1.60.2.136 src/addressbook.c;  ) > 3.7.4cvs10.patchset
+( cvs diff -u -r 1.94.2.207 -r 1.94.2.208 src/messageview.c;  cvs diff -u -r 1.83.2.157 -r 1.83.2.158 src/mimeview.c;  ) > 3.7.5cvs1.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/messageview.c b/src/messageview.c
@@ -1730,7 +1730,9 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
 		return TRUE;
 	}
 
-	if (event && (event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK|GDK_SHIFT_MASK)) != 0)
+	if (event && (event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
+		return FALSE;
+	if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_space) 
 		return FALSE;
 
 	g_signal_stop_emission_by_name(G_OBJECT(widget),
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -1407,13 +1407,16 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 		return FALSE;
 		
 	switch (event->keyval) {
+	case GDK_Page_Down:
 	case GDK_space:
-		if (mimeview_scroll_page(mimeview, FALSE))
+		if (mimeview_scroll_page(mimeview,
+					 (event->state & GDK_SHIFT_MASK) != 0))
 			return TRUE;
-
-		mimeview_select_next_part(mimeview);
+			
+		if (!(event->state & GDK_SHIFT_MASK))
+			mimeview_select_next_part(mimeview);
 		return TRUE;
-
+	case GDK_Page_Up:
 	case GDK_BackSpace:
 		mimeview_scroll_page(mimeview, TRUE);
 		return TRUE;
@@ -1422,6 +1425,10 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 		mimeview_scroll_one_line(mimeview,
 					 (event->state & GDK_MOD1_MASK) != 0);
 		return TRUE;
+	case GDK_Up:
+	case GDK_Down:
+		mimeview_scroll_one_line(mimeview, (event->keyval == GDK_Up));
+		return TRUE;
 	case GDK_n:
 	case GDK_N:
 		BREAK_ON_MODIFIER_KEY();