From 70861110247c4e33482aee5352084eed38949805 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 21 Jul 2010 23:46:31 -0400 Subject: [PATCH] Avoid double unescaping on locationbar updates --- midori/midori-browser.c | 2 +- midori/midori-locationaction.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index d3fff69f..460494a0 100644 --- 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 2ec6034b..34772b24 100644 --- 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); } /**