[epiphany] ephy-web-view: Do not convert ephy-about URIs in ephy_web_view_location_changed()
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-web-view: Do not convert ephy-about URIs in ephy_web_view_location_changed()
- Date: Fri, 11 Jan 2013 11:58:59 +0000 (UTC)
commit e0024b7841b206eb5fa6bdb553ffe7b8e56cf133
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Fri Jan 11 12:55:42 2013 +0100
ephy-web-view: Do not convert ephy-about URIs in ephy_web_view_location_changed()
We handle ephy-about URIs intetnally, they are converted to about: when
needed.
embed/ephy-web-view.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index c70d9d4..f30d20a 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2065,19 +2065,15 @@ ephy_web_view_location_changed (EphyWebView *view,
if (location == NULL || location[0] == '\0') {
ephy_web_view_set_address (view, NULL);
ephy_web_view_set_title (view, EMPTY_PAGE);
- } else if (g_str_has_prefix (location, EPHY_ABOUT_SCHEME)) {
- char *new_address = g_strdup_printf ("about:%s", location + EPHY_ABOUT_SCHEME_LEN + 1);
+ } else if (g_str_has_prefix (location, EPHY_ABOUT_SCHEME":applications")) {
+ SoupURI *uri = soup_uri_new (location);
+ char *new_address;
- if (g_str_has_prefix (new_address, "about:applications")) {
- SoupURI *uri = soup_uri_new (new_address);
+ /* Strip the query from the URL for about:applications. */
+ soup_uri_set_query (uri, NULL);
+ new_address = soup_uri_to_string (uri, FALSE);
+ soup_uri_free (uri);
- /* Strip the query from the URL for about:applications. */
- soup_uri_set_query (uri, NULL);
- g_free (new_address);
-
- new_address = soup_uri_to_string (uri, FALSE);
- soup_uri_free (uri);
- }
ephy_web_view_set_address (view, new_address);
g_free (new_address);
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]