[epiphany/wip/mcatanzaro/fedora-needs-upstreamed: 7/20] Display unescaped URIs in the bookmark properties dialog

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 54203f546020e3465c90ccba1d0f3d50f4e34d3c
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Dec 11 12:16:42 2014 +0100

    Display unescaped URIs in the bookmark properties dialog
    
    https://bugzilla.gnome.org/show_bug.cgi?id=710004

 src/bookmarks/ephy-bookmark-properties.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 221b686..d0d1758 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -306,6 +306,7 @@ ephy_bookmark_properties_constructor (GType type,
        GtkDialog *dialog;
        gboolean lockdown;
        const char *tmp;
+       char *unescaped_url;
 
        object = G_OBJECT_CLASS (ephy_bookmark_properties_parent_class)->constructor (type,
                                                                                       n_construct_properties,
@@ -371,7 +372,8 @@ ephy_bookmark_properties_constructor (GType type,
        gtk_editable_set_editable (GTK_EDITABLE (entry), !lockdown);
        tmp = ephy_node_get_property_string (properties->priv->bookmark,
                                             EPHY_NODE_BMK_PROP_LOCATION);
-       gtk_entry_set_text (GTK_ENTRY (entry), tmp);
+       unescaped_url = g_uri_unescape_string (tmp, NULL);
+       gtk_entry_set_text (GTK_ENTRY (entry), unescaped_url);
        g_signal_connect (entry, "changed",
                          G_CALLBACK (location_entry_changed_cb), properties);
        gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
@@ -383,6 +385,7 @@ ephy_bookmark_properties_constructor (GType type,
        gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
        gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1);
        gtk_widget_set_hexpand (entry, TRUE);
+       g_free (unescaped_url);
 
        entry = ephy_topics_entry_new (priv->bookmarks, priv->bookmark);
        gtk_editable_set_editable (GTK_EDITABLE (entry), !lockdown);