[epiphany] ephy-web-view: Do not update the URL when changed during committed state
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-web-view: Do not update the URL when changed during committed state
- Date: Fri, 11 Jan 2013 09:03:50 +0000 (UTC)
commit be49b7a2e25a6e6f6941240d9f9a5542c34ffd95
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Wed Jan 9 14:52:24 2013 +0100
ephy-web-view: Do not update the URL when changed during committed state
Similar to what we do in WebKit2, do not update the URL when view uri
changes while loading, because we already update the URL manually when
the load is committed.
embed/ephy-web-view.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 229a14b..d96d4fe 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1287,13 +1287,16 @@ uri_changed_cb (WebKitWebView *web_view,
char *uri;
const char *current_address;
-#ifdef HAVE_WEBKIT2
/* We already update the URI manually while loading, so only
* update the URI when it changes after the page has been loaded
* which is usually the result of navigation within the same page action.
*/
+#ifdef HAVE_WEBKIT2
if (webkit_web_view_is_loading (web_view))
return;
+#else
+ if (webkit_web_view_get_load_status (web_view) == WEBKIT_LOAD_COMMITTED)
+ return;
#endif
/* We need to check if we get URI notifications without going
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]