aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2009-06-14 07:50:06 +0800
committerXan Lopez <xan@gnome.org>2009-06-14 07:50:06 +0800
commit9fffee107074e250a5c9fb086da44d764a0454af (patch)
tree6fba0ad09f3281e3ee04f552f046140795fa3c24 /src
parented081ffca28639a928d9cb85bbbc3cb0474b9729 (diff)
downloadgsoc2013-epiphany-9fffee107074e250a5c9fb086da44d764a0454af.tar.gz
gsoc2013-epiphany-9fffee107074e250a5c9fb086da44d764a0454af.tar.zst
gsoc2013-epiphany-9fffee107074e250a5c9fb086da44d764a0454af.zip
Use WebKitWebView::load-status instead of our own solution.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-window.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index b5e32c61d..251bfb146 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1625,12 +1625,15 @@ sync_tab_load_progress (EphyWebView *view, GParamSpec *pspec, EphyWindow *window
for about:blank until the load is finished, so assume NULL
here means we are loading about:blank. This might not be
rigt :) */
+ /* When pspec is not NULL it means we are actually loading
+ something as oppossed to re-syncing the load state with the
+ current view */
uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW (view));
- if (loading && (!uri || strcmp (uri, "about:blank") == 0))
+ if (pspec && (!uri || strcmp (uri, "about:blank") == 0))
return;
progress = webkit_web_view_get_progress (WEBKIT_WEB_VIEW (view))/100.0;
- if (progress == 1.0 && loading)
+ if (progress == 1.0 && pspec)
{
window->priv->clear_progress_timeout_id =
g_timeout_add (500,
@@ -1641,7 +1644,7 @@ sync_tab_load_progress (EphyWebView *view, GParamSpec *pspec, EphyWindow *window
/* Do not set progress in the entry if the load is already
finished */
gtk_entry_set_progress_fraction (GTK_ENTRY (window->priv->entry),
- loading ? progress : 0.0);
+ pspec ? progress : 0.0);
}
static void