applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Keep the filter terms cached

Browse source 
This avoids calling g_strsplit() for every model item when filtering.

https://bugzilla.gnome.org/show_bug.cgi?id=729027
This commit is contained in:
Rui Matos 2014-04-26 21:02:56 +02:00
parent 169005cb45
commit 98a2ab2603
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/cc-window.c
View file

@ -97,6 +97,7 @@ struct _CcWindowPrivate
GtkTreeModel *search_filter; GtkTreeModel *search_filter;
GtkWidget *search_view; GtkWidget *search_view;
gchar *filter_string; gchar *filter_string;
gchar **filter_terms;
CcPanel *active_panel; CcPanel *active_panel;
@ -564,14 +565,13 @@ model_filter_func (GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
CcWindowPrivate *priv) CcWindowPrivate *priv)
{ {
char **terms, **t; char **t;
gboolean matches = FALSE; gboolean matches = FALSE;
if (!priv->filter_string) if (!priv->filter_string || !priv->filter_terms)
return FALSE; return FALSE;
terms = g_strsplit (priv->filter_string, " ", -1); for (t = priv->filter_terms; *t; t++)
for (t = terms; *t; t++)
{ {
matches = cc_shell_model_iter_matches_search (CC_SHELL_MODEL (model), matches = cc_shell_model_iter_matches_search (CC_SHELL_MODEL (model),
iter, iter,
@ -579,7 +579,6 @@ model_filter_func (GtkTreeModel *model,
if (!matches) if (!matches)
break; break;
} }
g_strfreev (terms);
return matches; return matches;
} }
@ -619,6 +618,9 @@ search_entry_changed_cb (GtkEntry *entry,
g_free (priv->filter_string); g_free (priv->filter_string);
priv->filter_string = str; priv->filter_string = str;
g_strfreev (priv->filter_terms);
priv->filter_terms = g_strsplit (priv->filter_string, " ", -1);
if (!g_strcmp0 (priv->filter_string, "")) if (!g_strcmp0 (priv->filter_string, ""))
{ {
shell_show_overview_page (center); shell_show_overview_page (center);
@ -1168,6 +1170,7 @@ cc_window_finalize (GObject *object)
CcWindowPrivate *priv = CC_WINDOW (object)->priv; CcWindowPrivate *priv = CC_WINDOW (object)->priv;
g_free (priv->filter_string); g_free (priv->filter_string);
g_strfreev (priv->filter_terms);
G_OBJECT_CLASS (cc_window_parent_class)->finalize (object); G_OBJECT_CLASS (cc_window_parent_class)->finalize (object);
} }