Updating branch refs/heads/master
to 70861110247c4e33482aee5352084eed38949805 (commit)
from f7cd519b7f3edb79f26d3fcd360513c40d4aed69 (commit)
commit 70861110247c4e33482aee5352084eed38949805
Author: Alexander Butenko <a.bute...@gmail.com>
Date: Wed Jul 21 23:46:31 2010 -0400
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 d3fff69..460494a 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 2ec6034..34772b2 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);
}
/**
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
