aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Noronha Silva <gns@src.gnome.org>2009-01-20 23:42:18 +0800
committerGustavo Noronha Silva <gns@src.gnome.org>2009-01-20 23:42:18 +0800
commit49265f276b828acfaadc05fc288274f8b8b385b5 (patch)
tree5661c7a0d4f4a2dedc991400d7bfcf8ea4a54dc0
parentb6714cc33b570c46f4beb35710b5240eebdf4aa0 (diff)
downloadgsoc2013-epiphany-49265f276b828acfaadc05fc288274f8b8b385b5.tar
gsoc2013-epiphany-49265f276b828acfaadc05fc288274f8b8b385b5.tar.gz
gsoc2013-epiphany-49265f276b828acfaadc05fc288274f8b8b385b5.tar.bz2
gsoc2013-epiphany-49265f276b828acfaadc05fc288274f8b8b385b5.tar.lz
gsoc2013-epiphany-49265f276b828acfaadc05fc288274f8b8b385b5.tar.xz
gsoc2013-epiphany-49265f276b828acfaadc05fc288274f8b8b385b5.tar.zst
gsoc2013-epiphany-49265f276b828acfaadc05fc288274f8b8b385b5.zip
Avoid adding problematic search terms with spaces
Adding spaces to the end of the location bar was adding bad search terms. This fixes it. svn path=/trunk/; revision=8709
-rw-r--r--lib/widgets/ephy-location-entry.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index ff84fa3fe..d8df730af 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -403,12 +403,17 @@ editable_changed_cb (GtkEditable *editable,
tmp = g_regex_escape_string (current, count);
term = g_regex_replace (quote_regex, tmp, -1, 0,
"", G_REGEX_MATCH_NOTEMPTY, NULL);
+ g_strstrip (term);
g_free (tmp);
- term_regex = g_regex_new (g_strstrip (term),
- G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
- G_REGEX_MATCH_NOTEMPTY, NULL);
- priv->search_terms = g_slist_append (priv->search_terms, term_regex);
+ /* we don't want empty search terms */
+ if (term[0] != '\0')
+ {
+ term_regex = g_regex_new (term,
+ G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
+ G_REGEX_MATCH_NOTEMPTY, NULL);
+ priv->search_terms = g_slist_append (priv->search_terms, term_regex);
+ }
g_free (term);
/* count will be incremented by the for loop */