HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When a filter is set, apply it only to files, not directories and apply the filter to the UTF-8 name of the file as the filter string itself is also UTF-8.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3772 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-05-08 16:13:29 +00:00
parent 651c196490
commit 1330c145e1
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2009-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* plugins/filebrowser.c:
When a filter is set, apply it only to files, not directories and
apply the filter to the UTF-8 name of the file as the filter string
itself is also UTF-8.
2009-05-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* wscript, scintilla/*, scintilla/include/*, src/plugindata.h:

13
plugins/filebrowser.c
View File

@ -168,13 +168,11 @@ static void add_item(const gchar *name)
if (! show_hidden_files && check_hidden(name))
return;
if (check_filtered(name))
return;
sep = (utils_str_equal(current_dir, "/")) ? "" : G_DIR_SEPARATOR_S;
fname = g_strconcat(current_dir, sep, name, NULL);
dir = g_file_test(fname, G_FILE_TEST_IS_DIR);
utf8_fullname = utils_get_locale_from_utf8(fname);
utf8_name = utils_get_utf8_from_locale(name);
g_free(fname);
if (dir)
@ -189,9 +187,16 @@ static void add_item(const gchar *name)
last_dir_iter = gtk_tree_iter_copy(&iter);
}
else
{
if (check_filtered(utf8_name))
{
g_free(utf8_name);
g_free(utf8_fullname);
return;
}
gtk_list_store_append(file_store, &iter);
}
utf8_name = utils_get_utf8_from_locale(name);
gtk_list_store_set(file_store, &iter,
FILEVIEW_COLUMN_ICON, (dir) ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE,