diff options
| author | Xan Lopez <xan@gnome.org> | 2009-06-14 06:04:41 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2009-06-14 06:04:41 +0800 |
| commit | a1af750fa1343236fd81ea9c1b6962e8ebabd4af (patch) | |
| tree | 34076370c0e37249f164860e616995a9e2601ece /src | |
| parent | 44e17944c010fd3e4aeb2b3eacd6ccc0be624df8 (diff) | |
| download | gsoc2013-epiphany-a1af750fa1343236fd81ea9c1b6962e8ebabd4af.tar gsoc2013-epiphany-a1af750fa1343236fd81ea9c1b6962e8ebabd4af.tar.gz gsoc2013-epiphany-a1af750fa1343236fd81ea9c1b6962e8ebabd4af.tar.bz2 gsoc2013-epiphany-a1af750fa1343236fd81ea9c1b6962e8ebabd4af.tar.lz gsoc2013-epiphany-a1af750fa1343236fd81ea9c1b6962e8ebabd4af.tar.xz gsoc2013-epiphany-a1af750fa1343236fd81ea9c1b6962e8ebabd4af.tar.zst gsoc2013-epiphany-a1af750fa1343236fd81ea9c1b6962e8ebabd4af.zip | |
Get rid of redundant 'load-progress' property in EphyWebView.
We now use WebKitWebView's 'progress' property directly.
The "opening about:blank blinks the entry" bug is back because for
some reason a) webkit reports a 10% progress for that URL b) get_uri
reports NULL until 100% is loaded for only that page, so blacklisting
by URI is not possible either.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-window.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index c8b117303..f90b315a5 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1606,7 +1606,7 @@ clear_progress_cb (EphyWindow *window) static void sync_tab_load_progress (EphyWebView *view, GParamSpec *pspec, EphyWindow *window) { - gdouble progress, previous_progress; + gdouble progress; gboolean loading; if (window->priv->closing) return; @@ -1617,17 +1617,9 @@ sync_tab_load_progress (EphyWebView *view, GParamSpec *pspec, EphyWindow *window window->priv->clear_progress_timeout_id = 0; } - progress = ephy_web_view_get_load_percent (view)/100.0; + progress = webkit_web_view_get_progress (WEBKIT_WEB_VIEW (view))/100.0; loading = ephy_web_view_get_load_status (view); - /* Do not show a 'blink' progress from pages that go from 0 to 100, - * for example about:blank. */ - /* This might be refined by actually checking that the transition - * from 0 to 100 indeed took almost no time at all */ - previous_progress = gtk_entry_get_progress_fraction (GTK_ENTRY (window->priv->entry)); - if (previous_progress == 0.0 && progress == 1.0) - return; - if (progress == 1.0 && loading) { window->priv->clear_progress_timeout_id = @@ -2848,7 +2840,7 @@ ephy_window_set_active_tab (EphyWindow *window, EphyEmbed *new_embed) g_signal_connect_object (view, "ge-context-menu", G_CALLBACK (tab_context_menu_cb), window, G_CONNECT_AFTER); - g_signal_connect_object (view, "notify::load-progress", + g_signal_connect_object (view, "notify::progress", G_CALLBACK (sync_tab_load_progress), window, 0); g_signal_connect_object (view, "ge_dom_mouse_click", |