[epiphany/wip/exalm/tabs: 28/37] Adapt to more libhandy changes




commit 213af5e6965905eecff4428b9651224c3070b98d
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri Sep 11 19:12:06 2020 +0500

    Adapt to more libhandy changes

 src/ephy-session.c | 24 ++++++++++++------------
 src/ephy-window.c  | 29 +++++++++++++++--------------
 2 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 95be63b34..b13cc0900 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -326,10 +326,10 @@ ephy_session_get_can_undo_tab_closed (EphySession *session)
 }
 
 static void
-tab_view_page_added_cb (HdyTabView  *tab_view,
-                        HdyTabPage  *page,
-                        guint        position,
-                        EphySession *session)
+tab_view_page_attached_cb (HdyTabView  *tab_view,
+                           HdyTabPage  *page,
+                           guint        position,
+                           EphySession *session)
 {
   EphyEmbed *embed = EPHY_EMBED (hdy_tab_page_get_child (page));
 
@@ -338,10 +338,10 @@ tab_view_page_added_cb (HdyTabView  *tab_view,
 }
 
 static void
-tab_view_page_removed_cb (HdyTabView  *tab_view,
-                          HdyTabPage  *page,
-                          gint         position,
-                          EphySession *session)
+tab_view_page_detached_cb (HdyTabView  *tab_view,
+                           HdyTabPage  *page,
+                           gint         position,
+                           EphySession *session)
 {
   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"));
@@ -402,10 +402,10 @@ window_added_cb (GtkApplication *application,
   ephy_window = EPHY_WINDOW (window);
 
   tab_view = ephy_tab_view_get_tab_view (ephy_window_get_tab_view (ephy_window));
-  g_signal_connect (tab_view, "page-added",
-                    G_CALLBACK (tab_view_page_added_cb), session);
-  g_signal_connect (tab_view, "page-removed",
-                    G_CALLBACK (tab_view_page_removed_cb), session);
+  g_signal_connect (tab_view, "page-attached",
+                    G_CALLBACK (tab_view_page_attached_cb), session);
+  g_signal_connect (tab_view, "page-detached",
+                    G_CALLBACK (tab_view_page_detached_cb), session);
   g_signal_connect (tab_view, "page-reordered",
                     G_CALLBACK (tab_view_page_reordered_cb), session);
   g_signal_connect_after (tab_view, "notify::selected-page",
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 79418314c..0e417fcc7 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2772,15 +2772,15 @@ reader_mode_cb (EphyWebView *view,
 }
 
 static void
-tab_view_page_added_cb (HdyTabView *tab_view,
-                        HdyTabPage *page,
-                        gint        position,
-                        EphyWindow *window)
+tab_view_page_attached_cb (HdyTabView *tab_view,
+                           HdyTabPage *page,
+                           gint        position,
+                           EphyWindow *window)
 {
   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);
+  LOG ("page-attached tab view %p embed %p position %d\n", tab_view, embed, position);
 
   g_assert (EPHY_IS_EMBED (content));
 
@@ -2801,13 +2801,14 @@ tab_view_page_added_cb (HdyTabView *tab_view,
 }
 
 static void
-tab_view_page_removed_cb (HdyTabView *tab_view,
-                          HdyTabPage *page,
-                          gint        position,
-                          EphyWindow *window)
+tab_view_page_detached_cb (HdyTabView *tab_view,
+                           HdyTabPage *page,
+                           gint        position,
+                           EphyWindow *window)
 {
   GtkWidget *content = hdy_tab_page_get_child (page);
-  LOG ("page-removed tab view %p embed %p position %d\n", tab_view, content, position);
+
+  LOG ("page-detached tab view %p embed %p position %d\n", tab_view, content, position);
 
   if (window->closing)
     return;
@@ -3142,12 +3143,12 @@ setup_tab_view (EphyWindow *window)
                            window,
                            0);
 
-  g_signal_connect_object (view, "page-added",
-                           G_CALLBACK (tab_view_page_added_cb),
+  g_signal_connect_object (view, "page-attached",
+                           G_CALLBACK (tab_view_page_attached_cb),
                            window,
                            0);
-  g_signal_connect_object (view, "page-removed",
-                           G_CALLBACK (tab_view_page_removed_cb),
+  g_signal_connect_object (view, "page-detached",
+                           G_CALLBACK (tab_view_page_detached_cb),
                            window,
                            0);
   g_signal_connect_object (view, "page-reordered",


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