[Xfce4-commits] <midori:master> Decode URIs before updating the locationbar

[Christian Dywan]

Updating branch refs/heads/master
         to 44a2351b72f7fd702c4b68c59943c50937632cc4 (commit)
       from 46b63639f6aea44508c3c203456a60bf7c8f0e38 (commit)

commit 44a2351b72f7fd702c4b68c59943c50937632cc4
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Wed Jul 21 10:35:47 2010 -0400

    Decode URIs before updating the locationbar

 midori/midori-browser.c        |    4 +---
 midori/midori-locationaction.c |    8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index c5043f2..42d61e0 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -609,9 +609,7 @@ midori_view_notify_title_cb (GtkWidget*     widget,
     uri = midori_view_get_display_uri (view);
     title = midori_view_get_display_title (view);
     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)
     {
         KatzeItem* item;
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index de70b2c..2ec6034 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1445,12 +1445,14 @@ 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);
 
-    katze_assign (location_action->uri, g_uri_unescape_string (uri, ""));
-
-    midori_location_action_set_text (location_action, uri);
+    escaped_uri = g_uri_unescape_string (uri, "");
+    midori_location_action_set_text (location_action, escaped_uri);
+    g_free (escaped_uri);
 }
 
 /**