From: Christian Dywan <christian@twotoasts.de>
Date: Sat, 21 Nov 2009 19:09:07 +0000 (+0100)
Subject: Do address matches with a simple strstr for now
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a38574473f58d8f61d8bab8920562bb4440aaf5c;p=midori

Do address matches with a simple strstr for now

The way we originally folded strings didn't work in all cases of
unicode strings and the last attempt to improve that broke it
on some systems while it improved on others.
So for now we go back to the safe way.
---

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index a99d7eb7..16057cad 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -735,8 +735,6 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion,
     gchar* uri;
     gchar* title;
     gboolean match;
-    gchar* temp;
-    gchar* ftemp;
 
     model = gtk_entry_completion_get_model (completion);
     gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1);
@@ -744,25 +742,11 @@ midori_location_entry_completion_match_cb (GtkEntryCompletion* completion,
     match = FALSE;
     if (G_LIKELY (uri))
     {
-        gchar* ckey = g_utf8_collate_key (key, -1);
-        gchar* fkey = g_utf8_casefold (ckey, -1);
-        g_free (ckey);
-        temp = g_utf8_collate_key (uri, -1);
-        ftemp = g_utf8_casefold (temp, -1);
-        g_free (temp);
-        match = (strstr (ftemp, fkey) != NULL);
-        g_free (ftemp);
+        match = strstr (uri, key) != NULL;
         g_free (uri);
 
         if (!match && G_LIKELY (title))
-        {
-            temp = g_utf8_collate_key (title, -1);
-            ftemp = g_utf8_casefold (temp, -1);
-            g_free (temp);
-            match = (strstr (ftemp, fkey) != NULL);
-            g_free (ftemp);
-        }
-        g_free (fkey);
+            match = strstr (title, key) != NULL;
     }
 
     g_free (title);