diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-07-25 17:14:08 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-07-27 20:06:32 -0500 |
| commit | 3c4525de2b3e7cfa8938709094aa9b9dd3a2b930 (patch) | |
| tree | 9ccc6bb54a4e659b9b65d4d061a8fedbcf5c1e78 | |
| parent | 961074415b68792ac0282e72a0d93245c1ad5ea2 (diff) | |
| download | epiphany-3c4525de2b3e7cfa8938709094aa9b9dd3a2b930.tar.gz | |
EphyWindow: store a decoded address, not a percent-encoded address
This means the location controller will get a user-friendly display URI.
https://bugzilla.gnome.org/show_bug.cgi?id=710004
| -rw-r--r-- | src/ephy-lockdown.c | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c index ac3c9f97e..257a966cd 100644 --- a/src/ephy-lockdown.c +++ b/src/ephy-lockdown.c @@ -71,7 +71,7 @@ arbitrary_url_cb (GSettings *settings, if (embed == NULL) return; - address = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); + address = ephy_web_view_get_display_address (ephy_embed_get_web_view (embed)); ephy_window_set_location (window, address); ephy_web_view_set_typed_address (ephy_embed_get_web_view (embed), NULL); } diff --git a/src/ephy-window.c b/src/ephy-window.c index 7d60661d7..de9ba9ff4 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1300,7 +1300,7 @@ sync_tab_address (EphyWebView *view, if (priv->closing) return; - address = ephy_web_view_get_address (view); + address = ephy_web_view_get_display_address (view); typed_address = ephy_web_view_get_typed_address (view); _ephy_window_set_default_actions_sensitive (window, @@ -2526,7 +2526,7 @@ embed_modal_alert_cb (EphyEmbed *embed, gtk_window_present (GTK_WINDOW (window)); /* make sure the location entry shows the real URL of the tab's page */ - address = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); + address = ephy_web_view_get_display_address (ephy_embed_get_web_view (embed)); ephy_window_set_location (window, address); /* don't suppress alert */ @@ -3867,7 +3867,7 @@ ephy_window_get_location (EphyWindow *window) /** * ephy_window_set_location: * @window: an #EphyWindow widget - * @address: new address + * @address: a decoded URI, suitable for display to the user * * Sets the internal #EphyLocationController address to @address. **/ |