From 20abb0405c42012e470173fc82dba03d7d4fe268 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sun, 21 Oct 2007 19:22:57 +0000 Subject: Move load-status from EphyTab to EphyEmbed. svn path=/trunk/; revision=7547 --- src/ephy-window.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/ephy-window.c') diff --git a/src/ephy-window.c b/src/ephy-window.c index 0ee4a68f4..e7c13c8b7 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -97,7 +97,7 @@ static void ephy_window_view_toolbar_cb (GtkAction *action, EphyWindow *window); static void ephy_window_view_popup_windows_cb (GtkAction *action, EphyWindow *window); -static void sync_tab_load_status (EphyTab *tab, +static void sync_tab_load_status (EphyEmbed *embed, GParamSpec *pspec, EphyWindow *window); static void sync_tab_security (EphyEmbed *embed, @@ -706,7 +706,7 @@ ephy_window_fullscreen (EphyWindow *window) /* sync status */ tab = ephy_window_get_active_tab (window); - sync_tab_load_status (tab, NULL, window); + sync_tab_load_status (ephy_tab_get_embed (tab), NULL, window); sync_tab_security (ephy_tab_get_embed (tab), NULL, window); egg_editable_toolbar_set_model @@ -1672,7 +1672,7 @@ sync_tab_popups_allowed (EphyTab *tab, } static void -sync_tab_load_status (EphyTab *tab, +sync_tab_load_status (EphyEmbed *embed, GParamSpec *pspec, EphyWindow *window) { @@ -1683,7 +1683,7 @@ sync_tab_load_status (EphyTab *tab, if (window->priv->closing) return; - loading = ephy_tab_get_load_status (tab); + loading = ephy_embed_get_load_status (embed); action = gtk_action_group_get_action (action_group, "ViewStop"); gtk_action_set_sensitive (action, loading); @@ -2151,9 +2151,6 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) g_signal_handlers_disconnect_by_func (old_tab, G_CALLBACK (sync_tab_icon), window); - g_signal_handlers_disconnect_by_func (old_tab, - G_CALLBACK (sync_tab_load_status), - window); g_signal_handlers_disconnect_by_func (old_tab, G_CALLBACK (sync_tab_message), window); @@ -2184,6 +2181,9 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) g_signal_handlers_disconnect_by_func (embed, G_CALLBACK (sync_tab_load_progress), window); + g_signal_handlers_disconnect_by_func (embed, + G_CALLBACK (sync_tab_load_status), + window); g_signal_handlers_disconnect_by_func (embed, G_CALLBACK (tab_context_menu_cb), window); @@ -2202,10 +2202,10 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) sync_tab_document_type (embed, NULL, window); sync_tab_zoom (embed, NULL, window); sync_tab_load_progress (embed, NULL, window); + sync_tab_load_status (embed, NULL, window); sync_tab_address (new_tab, NULL, window); sync_tab_icon (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); sync_tab_popup_windows (new_tab, NULL, window); @@ -2218,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-status", - G_CALLBACK (sync_tab_load_status), - window, 0); g_signal_connect_object (new_tab, "notify::message", G_CALLBACK (sync_tab_message), window, 0); @@ -2246,6 +2243,9 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab) g_signal_connect_object (embed, "notify::zoom", G_CALLBACK (sync_tab_zoom), window, 0); + g_signal_connect_object (embed, "notify::load-status", + G_CALLBACK (sync_tab_load_status), + window, 0); g_signal_connect_object (embed, "ge-context-menu", G_CALLBACK (tab_context_menu_cb), window, G_CONNECT_AFTER); -- cgit v1.2.3