From 5324d6e0418e1b9ab8ddc53322e538d976b07b6a Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Sun, 13 Jul 2003 10:25:47 +0000
Subject: [PATCH] * src/summaryview.c 	o for now don't pass on keys when they
 we're handled by           ctree::key_press_event         o clean up

---
 ChangeLog.claws   |  7 +++++++
 configure.ac      |  2 +-
 src/summaryview.c | 16 +++++++++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 56efbb572..f8a216dde 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-07-13 [alfons]	0.9.3claws3
+
+	* src/summaryview.c
+		o for now don't pass on keys when they we're handled by 
+		  ctree::key_press_event
+		o clean up
+
 2003-07-13 [alfons]	0.9.3claws2
 	
 	* src/main.c
diff --git a/configure.ac b/configure.ac
index 2e6a19825..f8b92e951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/summaryview.c b/src/summaryview.c
index b6cda6b14..642f43e23 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -263,7 +263,7 @@ static void summary_button_pressed	(GtkWidget		*ctree,
 static void summary_button_released	(GtkWidget		*ctree,
 					 GdkEventButton		*event,
 					 SummaryView		*summaryview);
-static void summary_key_pressed		(GtkWidget		*ctree,
+static gint summary_key_pressed		(GtkWidget		*ctree,
 					 GdkEventKey		*event,
 					 SummaryView		*summaryview);
 static gint summary_searchbar_pressed	(GtkWidget		*ctree,
@@ -526,7 +526,8 @@ static DescriptionWindow search_descr = {
 	search_descr_strings
 };
 	
-static void search_description_cb (GtkWidget *widget) {
+static void search_description_cb(GtkWidget *widget)
+{
 	description_window_create(&search_descr);
 };
 
@@ -4453,7 +4454,7 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define RETURN_IF_LOCKED() \
 	if (summaryview->mainwin->lock_count) return
 
-static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 				SummaryView *summaryview)
 {
 	GtkCTree *ctree = GTK_CTREE(widget);
@@ -4461,14 +4462,14 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 	MessageView *messageview;
 	TextView *textview;
 
-	if (summary_is_locked(summaryview)) return;
-	if (!event) return;
+	if (summary_is_locked(summaryview)) return TRUE;
+	if (!event) return TRUE;
 
 	switch (event->keyval) {
 	case GDK_Left:		/* Move focus */
 	case GDK_Escape:
 		gtk_widget_grab_focus(summaryview->folderview->ctree);
-		return;
+		return TRUE;
 	default:
 		break;
 	}
@@ -4478,7 +4479,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 		if (node)
 			gtk_sctree_select(GTK_SCTREE(ctree), node);
 		else
-			return;
+			return TRUE;
 	}
 
 	messageview = summaryview->messageview;
@@ -4525,6 +4526,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 	default:
 		break;
 	}
+	return TRUE;
 }
 
 static gint summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
-- 
2.25.1