diff --git a/extensions/actions/ephy-actions-extension.c b/extensions/actions/ephy-actions-extension.c index dce5a89..bc3f495 100644 --- a/extensions/actions/ephy-actions-extension.c +++ b/extensions/actions/ephy-actions-extension.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "ephy-file-helpers.h" #include "ephy-actions-extension.h" @@ -495,7 +496,7 @@ ephy_actions_extension_document_popup_cb (GtkAction *action, return; } - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); url = ephy_embed_get_location (embed, TRUE); ephy_actions_extension_run_action (action, window, url); g_free (url); diff --git a/extensions/adblock/ephy-adblock-extension.c b/extensions/adblock/ephy-adblock-extension.c index c899823..899ee76 100644 --- a/extensions/adblock/ephy-adblock-extension.c +++ b/extensions/adblock/ephy-adblock-extension.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -253,7 +254,7 @@ ephy_adblock_statusbar_icon_clicked_cb (GtkWidget *widget, { EphyAdblockExtension *ext; AdBlocker *blocker; - EphyEmbed *embed = ephy_window_get_active_tab (window); + EphyEmbed *embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); ext = EPHY_ADBLOCK_EXTENSION (g_object_get_data (G_OBJECT (window), EXTENSION_KEY)); @@ -281,7 +282,7 @@ update_statusbar (EphyWindow *window) int num_blocked; EphyAdblockExtension *ext; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (embed != NULL); ext = EPHY_ADBLOCK_EXTENSION (g_object_get_data (G_OBJECT (window), @@ -532,7 +533,7 @@ num_blocked_cb (AdBlocker *blocker, window = EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (embed))); g_return_if_fail (window != NULL); - if (embed == ephy_window_get_active_tab (window)) + if (embed == ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window))) { update_statusbar (window); } diff --git a/extensions/auto-reload/ephy-auto-reload-extension.c b/extensions/auto-reload/ephy-auto-reload-extension.c index 72cab66..10ee142 100644 --- a/extensions/auto-reload/ephy-auto-reload-extension.c +++ b/extensions/auto-reload/ephy-auto-reload-extension.c @@ -23,6 +23,7 @@ #include "ephy-auto-reload-extension.h" #include "ephy-debug.h" +#include #include #include @@ -145,7 +146,7 @@ static void ephy_auto_reload_activate_cb (GtkToggleAction *action, EphyWindow *window) { - EphyEmbed *embed = ephy_window_get_active_tab (window); + EphyEmbed *embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); /* Invalidate the current timeout */ g_object_set_data (G_OBJECT (embed), TIMEOUT_DATA_KEY, NULL); @@ -165,7 +166,7 @@ update_auto_reload_menu_cb (GtkAction *action, WindowData *data; TimeoutData *timeout; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); g_return_if_fail (data != NULL); diff --git a/extensions/error-viewer/ephy-error-viewer-extension.c b/extensions/error-viewer/ephy-error-viewer-extension.c index 164b78b..39c3046 100644 --- a/extensions/error-viewer/ephy-error-viewer-extension.c +++ b/extensions/error-viewer/ephy-error-viewer-extension.c @@ -31,8 +31,9 @@ #include #include -#include #include +#include +#include #include #include @@ -225,7 +226,7 @@ ephy_error_viewer_extension_validate (GtkAction *action, dialog = data->extension->priv->dialog; - embed = ephy_window_get_active_tab (data->window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (data->window)); ephy_dialog_show (EPHY_DIALOG (dialog)); @@ -242,7 +243,7 @@ ephy_error_viewer_extension_check_links (GtkAction *action, dialog = data->extension->priv->dialog; - embed = ephy_window_get_active_tab (data->window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (data->window)); ephy_dialog_show (EPHY_DIALOG (dialog)); @@ -285,7 +286,7 @@ update_actions (EphyWindow *window) action2 = gtk_ui_manager_get_action (GTK_UI_MANAGER (ephy_window_get_ui_manager (window)), "/menubar/ToolsMenu/CheckLinks"); - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); /* Not finished loading? */ if (ephy_embed_get_load_status (embed) == TRUE) diff --git a/extensions/gestures/ephy-gesture.c b/extensions/gestures/ephy-gesture.c index 966c870..7e24955 100644 --- a/extensions/gestures/ephy-gesture.c +++ b/extensions/gestures/ephy-gesture.c @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -472,7 +473,7 @@ ephy_gesture_activate (EphyGesture *gesture, EphyEmbedEvent *event; gint handled = FALSE; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (EPHY_IS_EMBED (embed)); event = ephy_gesture_get_event (gesture); diff --git a/extensions/greasemonkey/ephy-greasemonkey-extension.c b/extensions/greasemonkey/ephy-greasemonkey-extension.c index 7361399..1940205 100644 --- a/extensions/greasemonkey/ephy-greasemonkey-extension.c +++ b/extensions/greasemonkey/ephy-greasemonkey-extension.c @@ -28,8 +28,9 @@ #include #include -#include +#include #include +#include #include #include #include @@ -337,7 +338,7 @@ ephy_greasemonkey_extension_install_cb (GtkAction *action, url = data->last_clicked_url; g_return_if_fail (url != NULL); - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (embed != NULL); LOG ("Installing script at '%s'", url); diff --git a/extensions/page-info/ephy-page-info-extension.c b/extensions/page-info/ephy-page-info-extension.c index f8f8eac..3467f2d 100644 --- a/extensions/page-info/ephy-page-info-extension.c +++ b/extensions/page-info/ephy-page-info-extension.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -177,7 +178,7 @@ ephy_page_info_extension_display_cb (GtkAction *action, LOG ("Creating page info dialog"); - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (embed != NULL); data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); @@ -215,7 +216,7 @@ load_status_cb (EphyEmbed *embed, GParamSpec *pspec, EphyWindow *window) { - if (embed == ephy_window_get_active_tab (window)) + if (embed == ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window))) { update_action (window, embed); } @@ -231,7 +232,7 @@ switch_page_cb (GtkNotebook *notebook, if (GTK_WIDGET_REALIZED (window) == FALSE) return; /* on startup */ - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); update_action (window, embed); } diff --git a/extensions/rss/ephy-rss-extension.c b/extensions/rss/ephy-rss-extension.c index a88047e..32e2038 100644 --- a/extensions/rss/ephy-rss-extension.c +++ b/extensions/rss/ephy-rss-extension.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -196,7 +197,7 @@ ephy_rss_dialog_display (EphyWindow *window) priv = data->extension->priv; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (embed != NULL); list = (FeedList *) g_object_get_data (G_OBJECT (embed), FEEDLIST_DATA_KEY); @@ -265,7 +266,7 @@ ephy_rss_update_action (EphyWindow *window) gboolean show = TRUE; EphyEmbed *embed; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); /* The page is loaded, do we have a feed ? */ list = (FeedList *) g_object_get_data (G_OBJECT (embed), FEEDLIST_DATA_KEY); @@ -450,7 +451,7 @@ impl_attach_window (EphyExtension *ext, /* Register for tab switch events */ ephy_rss_sync_active_tab (window, NULL, NULL); - g_signal_connect_after (window, "notify::active-tab", + g_signal_connect_after (window, "notify::active-child", G_CALLBACK (ephy_rss_sync_active_tab), NULL); } diff --git a/extensions/select-stylesheet/ephy-css-menu.c b/extensions/select-stylesheet/ephy-css-menu.c index 0ef9e4a..d891801 100644 --- a/extensions/select-stylesheet/ephy-css-menu.c +++ b/extensions/select-stylesheet/ephy-css-menu.c @@ -27,6 +27,7 @@ #include #include +#include #include "ephy-debug.h" @@ -120,7 +121,7 @@ activate_stylesheet_cb (GtkAction *action, if (menu->priv->updating) return; g_return_if_fail (EPHY_IS_EMBED (p->embed)); - g_return_if_fail (ephy_window_get_active_tab (p->window) == p->embed); + g_return_if_fail (ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (p->window)) == p->embed); style = g_object_get_data (G_OBJECT (action), STYLESHEET_KEY); g_return_if_fail (style != NULL); @@ -297,7 +298,7 @@ sync_active_tab_cb (EphyWindow *window, { EphyEmbed *embed; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (embed != NULL); ephy_css_menu_set_embed (menu, embed); @@ -347,12 +348,12 @@ ephy_css_menu_set_window (EphyCSSMenu *menu, EphyWindow *window) GTK_UI_MANAGER_SEPARATOR, FALSE); /* Attach the signals to the window */ - g_signal_connect (window, "notify::active-tab", + g_signal_connect (window, "notify::active-child", G_CALLBACK (sync_active_tab_cb), menu); if (GTK_WIDGET_REALIZED (window)) { - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); ephy_css_menu_set_embed (menu, embed); ephy_css_menu_rebuild (menu); } diff --git a/extensions/smart-bookmarks/smart-bookmarks-extension.c b/extensions/smart-bookmarks/smart-bookmarks-extension.c index bc0b2f2..829d203 100644 --- a/extensions/smart-bookmarks/smart-bookmarks-extension.c +++ b/extensions/smart-bookmarks/smart-bookmarks-extension.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -137,7 +138,7 @@ search_gnome_dict_cb (GtkAction *action, char *argv[4] = { "gnome-dictionary", "--look-up", NULL, NULL }; GError *error = NULL; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (EPHY_IS_EMBED (embed)); /* ask Mozilla the selection */ @@ -167,7 +168,7 @@ search_smart_bookmark_cb (GtkAction *action, guint id; EphyNewTabFlags flags = EPHY_NEW_TAB_OPEN_PAGE; - embed = ephy_window_get_active_tab (window); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); g_return_if_fail (EPHY_IS_EMBED (embed)); /* ask Mozilla the selection */ diff --git a/extensions/tab-states/ephy-tab-states-extension.c b/extensions/tab-states/ephy-tab-states-extension.c index 56453f6..c2754ec 100644 --- a/extensions/tab-states/ephy-tab-states-extension.c +++ b/extensions/tab-states/ephy-tab-states-extension.c @@ -23,6 +23,7 @@ #include "ephy-tab-states-extension.h" +#include #include #include "eel-gconf-extensions.h" #include "ephy-debug.h" @@ -172,7 +173,7 @@ sync_active_tab (EphyWindow *window, EphyEmbed *active_tab; GtkWidget *label; - active_tab = ephy_window_get_active_tab (window); + active_tab = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); if (ephy_embed_get_load_status (active_tab) == FALSE) { @@ -211,7 +212,7 @@ sync_load_status (EphyEmbed *tab, #endif font_desc = priv->bold_font_desc; } - else if (tab != ephy_window_get_active_tab (window)) + else if (tab != ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window))) { #ifdef ENABLE_COLOURS colour = &priv->tab_unread_colour; @@ -234,7 +235,7 @@ impl_attach_window (EphyExtension *ext, LOG ("attach_window window %p", window); - g_signal_connect (window, "notify::active-tab", + g_signal_connect (window, "notify::active-child", G_CALLBACK (sync_active_tab), extension); }