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

Decode URIs before updating the locationbar

Browse source
This commit is contained in:
Alexander Butenko 2010-07-21 10:35:47 -04:00 committed by Christian Dywan
parent 46b63639f6
commit 44a2351b72
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/midori-browser.c
View file

@ -609,9 +609,7 @@ midori_view_notify_title_cb (GtkWidget* widget,
uri = midori_view_get_display_uri (view); uri = midori_view_get_display_uri (view);
title = midori_view_get_display_title (view); title = midori_view_get_display_title (view);
action = _action_by_name (browser, "Location"); action = _action_by_name (browser, "Location");
if (browser->maximum_history_age)
midori_location_action_set_title_for_uri (
MIDORI_LOCATION_ACTION (action), title, uri);
if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED) if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED)
{ {
KatzeItem* item; KatzeItem* item;

8
midori/midori-locationaction.c
View file

@ -1445,12 +1445,14 @@ 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);
katze_assign (location_action->uri, g_uri_unescape_string (uri, "")); escaped_uri = g_uri_unescape_string (uri, "");
midori_location_action_set_text (location_action, escaped_uri);
midori_location_action_set_text (location_action, uri); g_free (escaped_uri);
} }
/** /**