Avoid double unescaping on locationbar updates

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index d3fff69ff41663b73ed1186e28daf588903aa8cd..460494a06d9f9cb1c2048dfd5c1d70f7a72d3540 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -397,7 +397,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
         MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
         if (text && *text)
         {
-            midori_location_action_set_uri (location_action, text);
+            midori_location_action_set_uri (location_action, browser->statusbar_text);
             midori_location_action_set_icon (location_action, NULL);
             midori_location_action_set_secondary_icon (location_action, NULL);
         }

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 2ec6034b2f595e24c0596681eb7076d49758ede3..34772b24f5cd5406c963cd153a047df5bde26e29 100644 (file)
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1445,14 +1445,10 @@ void
 midori_location_action_set_uri (MidoriLocationAction* location_action,
                                 const gchar*          uri)
 {
-    gchar* escaped_uri;
-
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
     g_return_if_fail (uri != NULL);
 
-    escaped_uri = g_uri_unescape_string (uri, "");
-    midori_location_action_set_text (location_action, escaped_uri);
-    g_free (escaped_uri);
+    midori_location_action_set_text (location_action, uri);
 }
 
 /**