Merge branch 'search_column' into 'master'

Fix search column selection with --imagelist

See merge request GNOME/zenity!15

1 files changed, 8 insertions, 0 deletions

diff --git a/src/tree.c b/src/tree.c
index d94ce7e8..634ccbf5 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -635,6 +635,14 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) {
 				tree_data->editable);
 	}
 
+	/* GTK will automatically pick the image column as the search column
+	 * despite it not containing any user readable text.
+	 * Set it to second column instead if it exists. */
+	if (tree_data->imagebox && n_columns > 1) {
+		gtk_tree_view_set_search_column (GTK_TREE_VIEW (tree_view),
+			1);
+	}
+
 	zenity_util_show_dialog (dialog, data->attach);
 
 	if (tree_data->mid_search)