talons

commit 78f760e6609821eadb529e0a0e909a528d21bd96
parent 50711d2586293b35b3d82529114cb5641904646c
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  8 Jan 2009 17:21:58 +0000

2009-01-08 [colin]	3.7.0cvs18

	* src/mimeview.c
		Win32: Fix bug 1810, 'Pressing 'o' key
		crashes CM'

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

4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-08 [colin]	3.7.0cvs18
+
+	* src/mimeview.c
+		Win32: Fix bug 1810, 'Pressing 'o' key 
+		crashes CM'
+
 2009-01-07 [colin]	3.7.0cvs17
 
 	* src/html.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3679,3 +3679,4 @@
 ( cvs diff -u -r 1.274.2.292 -r 1.274.2.293 src/mainwindow.c;  cvs diff -u -r 1.83.2.150 -r 1.83.2.151 src/mimeview.c;  cvs diff -u -r 1.96.2.213 -r 1.96.2.214 src/textview.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/select-keys.c;  ) > 3.7.0cvs15.patchset
 ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/pgpcore/select-keys.c;  ) > 3.7.0cvs16.patchset
 ( cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/html.c;  ) > 3.7.0cvs17.patchset
+( cvs diff -u -r 1.83.2.151 -r 1.83.2.152 src/mimeview.c;  ) > 3.7.0cvs18.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -1451,13 +1451,13 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 		KEY_PRESS_EVENT_STOP();
 		mimeview_launch(mimeview, NULL);
 		return TRUE;
-#ifndef G_OS_WIN32
 	case GDK_o:
 		BREAK_ON_MODIFIER_KEY();
 		KEY_PRESS_EVENT_STOP();
+#ifndef G_OS_WIN32
 		mimeview_open_with(mimeview);
-		return TRUE;
 #endif
+		return TRUE;
 	case GDK_c:
 		BREAK_ON_MODIFIER_KEY();
 		KEY_PRESS_EVENT_STOP();