2009-01-08 [colin] 3.7.0cvs18

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

diff --git a/ChangeLog b/ChangeLog
index 61edeb5b5f384cb88d04d2c3a77085d6314e3904..e7fbb211dc34f56835e7c77731e0fd19579db6b4 100644 (file)
--- 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
index 1f938beafc3a79ea536756792239e2f2dc961dc8..9b0e02f47427b361aac33e9c098730ca5951e810 100644 (file)
--- 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
index c3fecba738e87a6ee4e40c4ab8bfe232901c8707..6d362fbd030150f158405cc9c71bf09f14769949 100644 (file)
--- 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
index 07eca9fd141792e56efe92c821e931e9cfea5204..1428085241bf05906ba964b1d91b4936c2d88aee 100644 (file)
--- 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();