callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appchooserwidget: search text using g_str_match_string()

Browse Source 
so we match on diacritics (eg. accented letters) and also
search on text tokens. As a plus we also reduce code size.

https://bugzilla.gnome.org/show_bug.cgi?id=745128
This commit is contained in:
Nelson Benítez León 2017-11-15 19:46:31 +05:00
parent 154fa9817d
commit 7a11fcf054
1 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/gtkappchooserwidget.c
View File

@ -309,58 +309,25 @@ gtk_app_chooser_search_equal_func (GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer user_data) gpointer user_data)
{ {
gchar *normalized_key; gchar *name;
gchar *name, *normalized_name; gchar *exec_name;
gchar *path, *normalized_path;
gchar *basename, *normalized_basename;
gboolean ret; gboolean ret;
if (key != NULL) if (key != NULL)
{ {
normalized_key = g_utf8_casefold (key, -1);
g_assert (normalized_key != NULL);
ret = TRUE; ret = TRUE;
gtk_tree_model_get (model, iter, gtk_tree_model_get (model, iter,
COLUMN_NAME, &name, COLUMN_NAME, &name,
COLUMN_EXEC, &path, COLUMN_EXEC, &exec_name,
-1); -1);
if (name != NULL) if ((name != NULL && g_str_match_string (key, name, TRUE)) ||
{ (exec_name != NULL && g_str_match_string (key, exec_name, FALSE)))
normalized_name = g_utf8_casefold (name, -1); ret = FALSE;
g_assert (normalized_name != NULL);
if (strncmp (normalized_name, normalized_key, strlen (normalized_key)) == 0)
ret = FALSE;
g_free (normalized_name);
}
if (ret && path != NULL)
{
normalized_path = g_utf8_casefold (path, -1);
g_assert (normalized_path != NULL);
basename = g_path_get_basename (path);
g_assert (basename != NULL);
normalized_basename = g_utf8_casefold (basename, -1);
g_assert (normalized_basename != NULL);
if (strncmp (normalized_path, normalized_key, strlen (normalized_key)) == 0 ||
strncmp (normalized_basename, normalized_key, strlen (normalized_key)) == 0)
ret = FALSE;
g_free (basename);
g_free (normalized_basename);
g_free (normalized_path);
}
g_free (name); g_free (name);
g_free (path); g_free (exec_name);
g_free (normalized_key);
return ret; return ret;
} }