[epiphany/wip/exalm/tabs: 7/17] Adapt to libhandy changes




commit 8e988282c9a2285c32ee35219f81a9eacc872792
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri Sep 11 18:05:28 2020 +0500

    Adapt to libhandy changes

 src/ephy-page-row.c |  4 ++--
 src/ephy-session.c  |  4 ++--
 src/ephy-tab-view.c | 18 +++++++++---------
 src/ephy-window.c   |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/ephy-page-row.c b/src/ephy-page-row.c
index ea4a000f5..6d27ffd83 100644
--- a/src/ephy-page-row.c
+++ b/src/ephy-page-row.c
@@ -103,7 +103,7 @@ loading_to_visible_child (GBinding     *binding,
 static void
 update_icon_cb (EphyPageRow *self)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (self->page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (self->page));
   EphyWebView *view = ephy_embed_get_web_view (embed);
   GIcon *icon = G_ICON (ephy_web_view_get_icon (view));
   const char *uri, *favicon_name;
@@ -136,7 +136,7 @@ ephy_page_row_new (EphyTabView *tab_view,
                    HdyTabPage  *page)
 {
   EphyPageRow *self;
-  GtkWidget *embed = hdy_tab_page_get_content (page);
+  GtkWidget *embed = hdy_tab_page_get_child (page);
   EphyWebView *view;
 
   g_assert (HDY_IS_TAB_PAGE (page));
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 3abf54556..95be63b34 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -331,7 +331,7 @@ tab_view_page_added_cb (HdyTabView  *tab_view,
                         guint        position,
                         EphySession *session)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
 
   g_signal_connect (ephy_embed_get_web_view (embed), "load-changed",
                     G_CALLBACK (load_changed_cb), session);
@@ -343,7 +343,7 @@ tab_view_page_removed_cb (HdyTabView  *tab_view,
                           gint         position,
                           EphySession *session)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
   EphyTabView *ephy_tab_view = EPHY_TAB_VIEW (g_object_get_data (G_OBJECT (tab_view), "ephy-tab-view"));
 
   ephy_session_save (session);
diff --git a/src/ephy-tab-view.c b/src/ephy-tab-view.c
index 75e32b7d8..6bcc4a525 100644
--- a/src/ephy-tab-view.c
+++ b/src/ephy-tab-view.c
@@ -61,7 +61,7 @@ static void
 secondary_icon_activated_cb (EphyTabView *self,
                              HdyTabPage  *page)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
   EphyWebView *view = ephy_embed_get_web_view (embed);
   gboolean muted = webkit_web_view_get_is_muted (WEBKIT_WEB_VIEW (view));
 
@@ -242,7 +242,7 @@ ephy_tab_view_foreach (EphyTabView *self,
   for (i = 0; i < n; i++) {
     HdyTabPage *page = hdy_tab_view_get_nth_page (self->tab_view, i);
 
-    callback (hdy_tab_page_get_content (page), user_data);
+    callback (hdy_tab_page_get_child (page), user_data);
   }
 }
 
@@ -266,7 +266,7 @@ ephy_tab_view_get_nth_page (EphyTabView *self,
 {
   HdyTabPage *page = hdy_tab_view_get_nth_page (self->tab_view, index);
 
-  return hdy_tab_page_get_content (page);
+  return hdy_tab_page_get_child (page);
 }
 
 void
@@ -295,7 +295,7 @@ ephy_tab_view_get_selected_page (EphyTabView *self)
 {
   HdyTabPage *page = hdy_tab_view_get_selected_page (self->tab_view);
 
-  return hdy_tab_page_get_content (page);
+  return hdy_tab_page_get_child (page);
 }
 
 HdyTabView *
@@ -314,7 +314,7 @@ ephy_tab_view_get_pages (EphyTabView *self)
 
   for (i = 0; i < n; i++) {
     HdyTabPage *page = hdy_tab_view_get_nth_page (self->tab_view, i);
-    GtkWidget *content = hdy_tab_page_get_content (page);
+    GtkWidget *content = hdy_tab_page_get_child (page);
 
     list = g_list_prepend (list, content);
   }
@@ -334,7 +334,7 @@ ephy_tab_view_get_is_pinned (EphyTabView *self,
 static void
 update_title_cb (HdyTabPage *page)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
   EphyWebView *view = ephy_embed_get_web_view (embed);
   const gchar *title = ephy_embed_get_title (embed);
   const gchar *address;
@@ -360,7 +360,7 @@ update_title_cb (HdyTabPage *page)
 static void
 update_icon_cb (HdyTabPage *page)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
   EphyWebView *view = ephy_embed_get_web_view (embed);
   g_autoptr (GIcon) icon = G_ICON (ephy_web_view_get_icon (view));
   const char *uri, *favicon_name;
@@ -383,7 +383,7 @@ update_icon_cb (HdyTabPage *page)
 static void
 update_secondary_icon_cb (HdyTabPage *page)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
   EphyWebView *view = ephy_embed_get_web_view (embed);
   GIcon *icon = NULL;
 
@@ -449,5 +449,5 @@ ephy_tab_view_add_tab (EphyTabView *self,
 GtkWidget *
 ephy_tab_view_get_current_page (EphyTabView *self)
 {
-  return hdy_tab_page_get_content (get_current_page (self));
+  return hdy_tab_page_get_child (get_current_page (self));
 }
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 88fa1f4fd..4d44b7f17 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2775,7 +2775,7 @@ tab_view_page_added_cb (HdyTabView *tab_view,
                         gint        position,
                         EphyWindow *window)
 {
-  GtkWidget *content = hdy_tab_page_get_content (page);
+  GtkWidget *content = hdy_tab_page_get_child (page);
   EphyEmbed *embed;
 
   LOG ("page-added tab view %p embed %p position %d\n", tab_view, embed, position);
@@ -2804,7 +2804,7 @@ tab_view_page_removed_cb (HdyTabView *tab_view,
                           gint        position,
                           EphyWindow *window)
 {
-  GtkWidget *content = hdy_tab_page_get_content (page);
+  GtkWidget *content = hdy_tab_page_get_child (page);
   LOG ("page-removed tab view %p embed %p position %d\n", tab_view, content, position);
 
   if (window->closing)
@@ -2996,7 +2996,7 @@ tab_view_close_page_cb (HdyTabView *tab_view,
                         HdyTabPage *page,
                         EphyWindow *window)
 {
-  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_content (page));
+  EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
 
   if (ephy_tab_view_get_n_pages (window->tab_view) == 1) {
     if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]