talons

commit a0557931d44527dcb1ee23d7539df08e1617dba5
parent 736946c17e38756b6313c97f0e356aad53f5bab7
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Sun, 30 Oct 2011 16:59:14 +0000

2011-10-30 [pawel]	3.7.10cvs58

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

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

4 files changed, 9 insertions(+), 14 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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,