2011-10-30 [pawel] 3.7.10cvs58

	* src/mimeview.c
		Remove key-press-event blocking, it only
		emits GLib-GObject warnings

diff --git a/ChangeLog b/ChangeLog
index 8c7ec8b06b4672a00153fa405195ecff17508a5a..093806a2fd46cb3ad9b8a20633dede4849a86fce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-30 [pawel]     3.7.10cvs58
+
+       * src/mimeview.c
+               Remove key-press-event blocking, it only
+               emits GLib-GObject warnings
+
 2011-10-29 [colin]     3.7.10cvs57
 
        * src/addr_compl.c

diff --git a/PATCHSETS b/PATCHSETS
index 6594be38469d0f77e91d2c3a28fffbe173711bad..ba5c21118f371177e5a466b7adc159bcf3687173 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4261,3 +4261,4 @@
 ( cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/alertpanel.c;  cvs diff -u -r 1.274.2.332 -r 1.274.2.333 src/mainwindow.c;  ) > 3.7.10cvs55.patchset
 ( cvs diff -u -r 1.207.2.224 -r 1.207.2.225 src/folderview.c;  ) > 3.7.10cvs56.patchset
 ( cvs diff -u -r 1.27.2.58 -r 1.27.2.59 src/addr_compl.c;  ) > 3.7.10cvs57.patchset
+( cvs diff -u -r 1.83.2.175 -r 1.83.2.176 src/mimeview.c;  ) > 3.7.10cvs58.patchset

diff --git a/configure.ac b/configure.ac
index 9a7d43288edc653bf96f13341ae0e4f05c1dc585..63578a05b84b79247cd54083bf5ac6f5ca02b314 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=57
+EXTRA_VERSION=58
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 5c9d633d657a0fc5e798452498071d79a57dd3bc..7bf8510f6e8d45074407694a79b6f8268497f32d 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1429,15 +1429,10 @@ skip:
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-#define KEY_PRESS_EVENT_STOP() \
-        g_signal_stop_emission_by_name(G_OBJECT(ctree), \
-                                       "key_press_event");
-
 static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 MimeView *mimeview)
 {
        SummaryView *summaryview;
-       GtkCMCTree *ctree = GTK_CMCTREE(widget);
 
        if (!event) return FALSE;
        if (!mimeview->opened) return FALSE;
@@ -1484,34 +1479,28 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        case GDK_KEY_y:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_save_as(mimeview);
                return TRUE;
        case GDK_KEY_t:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_display_as_text(mimeview);
                return TRUE;    
        case GDK_KEY_l:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview, NULL);
                return TRUE;
        case GDK_KEY_o:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
 #ifndef G_OS_WIN32
                mimeview_open_with(mimeview);
 #endif
                return TRUE;
        case GDK_KEY_c:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_check_signature(mimeview);
                return TRUE;
        case GDK_KEY_a:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_select_next_part(mimeview);
                return TRUE;
        default:
@@ -1520,8 +1509,7 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        if (!mimeview->messageview->mainwin) return FALSE;
 
-       summary_pass_key_press_event(summaryview, event);
-       return TRUE;
+       return summary_pass_key_press_event(summaryview, event);
 }
 
 static void mimeview_drag_data_get(GtkWidget       *widget,