talons

commit 623212907b9df76c3ae89887b4bdb671b04f17b9
parent 30a3dfa55830c3498ce7057ff3a38586c13a8d0c
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 20 Nov 2012 22:07:56 +0000

2012-11-20 [colin]	3.9.0cvs17

	* src/prefs_matcher.c
		Fix bug #2801, "Filtering Header:Name list is blank/corrupt"

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

4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20 [colin]	3.9.0cvs17
+
+	* src/prefs_matcher.c
+		Fix bug #2801, "Filtering Header:Name list is blank/corrupt"
+
 2012-11-20 [ticho]	3.9.0cvs16
 
 	* src/gtk/prefswindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4514,3 +4514,4 @@
 ( cvs diff -u -r 1.100.2.86 -r 1.100.2.87 AUTHORS;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/advsearch.c;  cvs diff -u -r 1.75.2.78 -r 1.75.2.79 src/matcher.c;  cvs diff -u -r 1.39.2.23 -r 1.39.2.24 src/matcher.h;  cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/matcher_parser_parse.y;  cvs diff -u -r 1.43.2.99 -r 1.43.2.100 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.82 -r 1.1.2.83 src/gtk/authors.h;  cvs diff -u -r 1.1.2.121 -r 1.1.2.122 src/gtk/quicksearch.c;  ) > 3.9.0cvs14.patchset
 ( cvs diff -u -r 1.52.2.91 -r 1.52.2.92 src/prefs_folder_item.c;  ) > 3.9.0cvs15.patchset
 ( cvs diff -u -r 1.12.2.62 -r 1.12.2.63 src/gtk/prefswindow.c;  ) > 3.9.0cvs16.patchset
+( cvs diff -u -r 1.43.2.100 -r 1.43.2.101 src/prefs_matcher.c;  ) > 3.9.0cvs17.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -652,6 +652,10 @@ static void prefs_matcher_create(void)
 	headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
 #else
 	headers_combo = gtk_combo_box_new_with_model_and_entry(matcher.model_headers);
+	GtkCellRenderer *cell = gtk_cell_renderer_text_new();
+	gtk_cell_renderer_set_alignment(cell, 0.0, 0.5);
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(headers_combo), cell, TRUE);
+	gtk_combo_box_set_entry_text_column(headers_combo, 0);
 #endif
 	gtk_widget_set_size_request(headers_combo, 100, -1);
 	gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);