talons

commit 9a56118f8110ab403cb94547cca11c0cc3ab490c
parent 02b5ac9ed2d474e546a655c636e4c9e43dd3250b
Author: Colin Leroy <colin@colino.net>
Date:   Sat, 28 Dec 2013 17:40:12 +0100

Fix bug #3038, "Select A Folder incorrectly matches on number
in parentheses". Match on FolderItem's name instead of displayed
string.

Diffstat:
M
src/foldersel.c
 | 
12
++++++++++--

1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/foldersel.c b/src/foldersel.c
@@ -201,10 +201,18 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
 static gboolean foldersel_search_name_func(GtkTreeModel *model, gint column,
 		const gchar *key, GtkTreeIter *iter, gpointer search_data)
 {
-	gchar *store_string;
+	gchar *store_string = NULL;
+	FolderItem *item;
 	gboolean retval;
 
-	gtk_tree_model_get(model, iter, column, &store_string, -1);
+	if (column == FOLDERSEL_FOLDERNAME) {
+		/* get the name of the FolderItem, not the displayed string */
+		gtk_tree_model_get(model, iter,
+			   FOLDERSEL_FOLDERITEM, &item, -1);
+		store_string = folder_item_get_name(item);
+	} else {
+		gtk_tree_model_get(model, iter, column, &store_string, -1);
+	}
 
 	if (!store_string || !key)
 		return FALSE;