Fix bug #3038, "Select A Folder incorrectly matches on number

in parentheses". Match on FolderItem's name instead of displayed
string.

diff --git a/src/foldersel.c b/src/foldersel.c
index ab512dcb2f86c2c6dddf0281ad9b1412d81a6665..a34d513f6e512fd134d018b49f74c892ab155798 100644 (file)
--- 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;