debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid double unescaping on locationbar updates

Browse source
This commit is contained in:
Alexander Butenko 2010-07-21 23:46:31 -04:00 committed by Christian Dywan
parent f7cd519b7f
commit 7086111024
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/midori-browser.c
View file

@ -397,7 +397,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
if (text && *text) 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_icon (location_action, NULL);
midori_location_action_set_secondary_icon (location_action, NULL); midori_location_action_set_secondary_icon (location_action, NULL);
} }

6
midori/midori-locationaction.c
View file

@ -1445,14 +1445,10 @@ void
midori_location_action_set_uri (MidoriLocationAction* location_action, midori_location_action_set_uri (MidoriLocationAction* location_action,
const gchar* uri) const gchar* uri)
{ {
gchar* escaped_uri;
g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
g_return_if_fail (uri != NULL); g_return_if_fail (uri != NULL);
escaped_uri = g_uri_unescape_string (uri, ""); midori_location_action_set_text (location_action, uri);
midori_location_action_set_text (location_action, escaped_uri);
g_free (escaped_uri);
} }
/** /**