talons

commit 2dfdfb84e72608b1a3501b1f7b899fc260cbe362
parent 0ef62dd66bcb2463c9500c37c4c88653e6ca4622
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Sun,  5 Aug 2012 12:40:23 +0000

2012-08-05 [ticho]	3.8.1cvs25

	* src/compose.c
		Avoid header combo box to get focus twice (first text within,
		then combobox widget itself) when switching focus with TAB.

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

4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-05 [ticho]	3.8.1cvs25
+
+	* src/compose.c
+		Avoid header combo box to get focus twice (first text within,
+		then combobox widget itself) when switching focus with TAB.
+
 2012-07-28 [ticho]	3.8.1cvs24
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4399,3 +4399,4 @@
 ( cvs diff -u -r 1.395.2.447 -r 1.395.2.448 src/summaryview.c;  cvs diff -u -r 1.96.2.243 -r 1.96.2.244 src/textview.c;  ) > 3.8.1cvs22.patchset
 ( cvs diff -u -r 1.5.2.63 -r 1.5.2.64 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.61 -r 1.12.2.62 src/gtk/prefswindow.c;  ) > 3.8.1cvs23.patchset
 ( cvs diff -u -r 1.382.2.605 -r 1.382.2.606 src/compose.c;  ) > 3.8.1cvs24.patchset
+( cvs diff -u -r 1.382.2.606 -r 1.382.2.607 src/compose.c;  ) > 3.8.1cvs25.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -6659,6 +6659,11 @@ static void compose_create_header_entry(Compose *compose)
 	g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(combo))), "grab_focus",
 			 G_CALLBACK(compose_grab_focus_cb), compose);
 	gtk_widget_show(combo);
+	
+	GList *l = NULL;
+	l = g_list_prepend(l, gtk_bin_get_child(GTK_BIN(combo)));
+	gtk_container_set_focus_chain(GTK_CONTAINER(combo), l);
+	g_list_free(l);
 
 	gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1,
 			compose->header_nextrow, compose->header_nextrow+1,