diff options
author | Carlos Garcia Campos <cgarcia@igalia.com> | 2013-01-09 21:52:24 +0800 |
---|---|---|
committer | Carlos Garcia Campos <cgarcia@igalia.com> | 2013-01-11 16:17:02 +0800 |
commit | be49b7a2e25a6e6f6941240d9f9a5542c34ffd95 (patch) | |
tree | 74c940dadacfc368637667b39c74504c5a6f3730 | |
parent | c4c0f51735760c465b4c7273681800d97f861885 (diff) | |
download | gsoc2013-epiphany-be49b7a2e25a6e6f6941240d9f9a5542c34ffd95.tar gsoc2013-epiphany-be49b7a2e25a6e6f6941240d9f9a5542c34ffd95.tar.gz gsoc2013-epiphany-be49b7a2e25a6e6f6941240d9f9a5542c34ffd95.tar.bz2 gsoc2013-epiphany-be49b7a2e25a6e6f6941240d9f9a5542c34ffd95.tar.lz gsoc2013-epiphany-be49b7a2e25a6e6f6941240d9f9a5542c34ffd95.tar.xz gsoc2013-epiphany-be49b7a2e25a6e6f6941240d9f9a5542c34ffd95.tar.zst gsoc2013-epiphany-be49b7a2e25a6e6f6941240d9f9a5542c34ffd95.zip |
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.
-rw-r--r-- | 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 229a14bb3..d96d4fe90 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 |