diff options
| author | Xan Lopez <xan@src.gnome.org> | 2007-10-22 02:09:23 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2007-10-22 02:09:23 +0800 |
| commit | 568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e (patch) | |
| tree | 7841ea91598f3ed5b786dded227380096bb5ebce /src/ephy-window.c | |
| parent | 1a1e303ced1a791dc691aeebb460a98ca3a1800d (diff) | |
| download | gsoc2013-epiphany-568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e.tar gsoc2013-epiphany-568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e.tar.gz gsoc2013-epiphany-568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e.tar.bz2 gsoc2013-epiphany-568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e.tar.lz gsoc2013-epiphany-568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e.tar.xz gsoc2013-epiphany-568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e.tar.zst gsoc2013-epiphany-568af9a8d3dfa62be38bce6204d0d13bf4fa9e1e.zip | |
Move load-progress from EphyTab to EphyEmbed
svn path=/trunk/; revision=7544
Diffstat (limited to 'src/ephy-window.c')
| -rw-r--r-- | src/ephy-window.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index efeb48605..0ee4a68f4 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1441,12 +1441,12 @@ sync_tab_icon (EphyTab *tab, } static void -sync_tab_load_progress (EphyTab *tab, GParamSpec *pspec, EphyWindow *window) +sync_tab_load_progress (EphyEmbed *embed, GParamSpec *pspec, EphyWindow *window) { if (window->priv->closing) return; ephy_statusbar_set_progress (EPHY_STATUSBAR (window->priv->statusbar), - ephy_tab_get_load_percent (tab)); + ephy_embed_get_load_percent (embed)); } static void @@ -2152,9 +2152,6 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) G_CALLBACK (sync_tab_icon), window); g_signal_handlers_disconnect_by_func (old_tab, - G_CALLBACK (sync_tab_load_progress), - window); - g_signal_handlers_disconnect_by_func (old_tab, G_CALLBACK (sync_tab_load_status), window); g_signal_handlers_disconnect_by_func (old_tab, @@ -2184,7 +2181,9 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) g_signal_handlers_disconnect_by_func (embed, G_CALLBACK (sync_tab_zoom), window); - + g_signal_handlers_disconnect_by_func (embed, + G_CALLBACK (sync_tab_load_progress), + window); g_signal_handlers_disconnect_by_func (embed, G_CALLBACK (tab_context_menu_cb), window); @@ -2202,10 +2201,10 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) sync_tab_security (embed, NULL, window); sync_tab_document_type (embed, NULL, window); sync_tab_zoom (embed, NULL, window); + sync_tab_load_progress (embed, NULL, window); sync_tab_address (new_tab, NULL, window); sync_tab_icon (new_tab, NULL, window); - sync_tab_load_progress (new_tab, NULL, window); sync_tab_load_status (new_tab, NULL, window); sync_tab_message (new_tab, NULL, window); sync_tab_navigation (new_tab, NULL, window); @@ -2219,9 +2218,6 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) g_signal_connect_object (new_tab, "notify::icon", G_CALLBACK (sync_tab_icon), window, 0); - g_signal_connect_object (new_tab, "notify::load-progress", - G_CALLBACK (sync_tab_load_progress), - window, 0); g_signal_connect_object (new_tab, "notify::load-status", G_CALLBACK (sync_tab_load_status), window, 0); @@ -2256,6 +2252,10 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) g_signal_connect_object (embed, "size-to", G_CALLBACK (tab_size_to_cb), window, 0); + g_signal_connect_object (embed, "notify::load-progress", + G_CALLBACK (sync_tab_load_progress), + window, 0); + g_object_notify (G_OBJECT (window), "active-tab"); } |