main: Use GtkBin as base class instead GtkActionBar

GtkActionBar is parts of the widgets which cannot be used as base
class in Gtk4.

3 files changed, 97 insertions, 92 deletions

diff --git a/src/totem-selection-toolbar.c b/src/totem-selection-toolbar.c
index 6ce4f5d1c..38f8b64b8 100644
--- a/src/totem-selection-toolbar.c
+++ b/src/totem-selection-toolbar.c
@@ -43,7 +43,7 @@
  */
 
 struct _TotemSelectionToolbar {
-  GtkActionBar parent;
+  GtkBin       parent;
 
   /* Template widgets */
   GtkWidget   *add_to_fav;
@@ -59,7 +59,7 @@ struct _TotemSelectionToolbar {
   guint        n_selected;
 };
 
-G_DEFINE_TYPE (TotemSelectionToolbar, totem_selection_toolbar, GTK_TYPE_ACTION_BAR)
+G_DEFINE_TYPE (TotemSelectionToolbar, totem_selection_toolbar, GTK_TYPE_BIN)
 
 enum {
   PROP_0,
diff --git a/src/totem-selection-toolbar.h b/src/totem-selection-toolbar.h
index 5036ef09c..ea5611f01 100644
--- a/src/totem-selection-toolbar.h
+++ b/src/totem-selection-toolbar.h
@@ -27,12 +27,12 @@
 
 #pragma once
 
-#include <gtk/gtkactionbar.h>
+#include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
 
 #define TOTEM_TYPE_SELECTION_TOOLBAR                 (totem_selection_toolbar_get_type ())
-G_DECLARE_FINAL_TYPE (TotemSelectionToolbar, totem_selection_toolbar, TOTEM, SELECTION_TOOLBAR, GtkActionBar)
+G_DECLARE_FINAL_TYPE (TotemSelectionToolbar, totem_selection_toolbar, TOTEM, SELECTION_TOOLBAR, GtkBin)
 
 GType           totem_selection_toolbar_get_type               (void) G_GNUC_CONST;
 GtkWidget*      totem_selection_toolbar_new                    (void);
diff --git a/src/totemselectiontoolbar.ui b/src/totemselectiontoolbar.ui
index c47d0199f..869e7af34 100644
--- a/src/totemselectiontoolbar.ui
+++ b/src/totemselectiontoolbar.ui
@@ -1,95 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="totem">
   <!-- interface-requires gtk+ 3.11 -->
-  <template class="TotemSelectionToolbar" parent="GtkActionBar">
+  <template class="TotemSelectionToolbar" parent="GtkBin">
     <property name="app_paintable">True</property>
     <property name="can_focus">False</property>
-      <child>
-        <object class="GtkButton" id="add_to_fav">
-          <property name="visible">True</property>
-          <property name="can_focus">True</property>
-          <property name="receives_default">True</property>
-          <property name="no-show-all">True</property>
-          <child internal-child="accessible">
-            <object class="AtkObject" id="add-to-fav-atkobject">
-              <property name="AtkObject::accessible-name" translatable="yes">Add to Favourites</property>
-            </object>
-         </child>
-          <style>
-            <class name="image-button"/>
-          </style>
-          <child>
-            <object class="GtkImage" id="add_to_fav_image">
-              <property name="visible">True</property>
-              <property name="can_focus">False</property>
-              <property name="icon_name">emblem-favorite-symbolic</property>
-              <property name="icon_size">1</property>
-            </object>
-          </child>
-        </object>
-        <packing>
-          <property name="pack_type">start</property>
-        </packing>
-      </child>
-      <child>
-        <object class="GtkButton" id="play">
-          <property name="visible">True</property>
-          <property name="can_focus">True</property>
-          <property name="receives_default">True</property>
-          <property name="no-show-all">True</property>
-          <property name="label" translatable="yes" context="button">Play</property>
-          <child internal-child="accessible">
-            <object class="AtkObject" id="play-atkobject">
-              <property name="AtkObject::accessible-name" translatable="yes">Play</property>
-            </object>
-         </child>
-          <style>
-            <class name="image-button"/>
-          </style>
-        </object>
-        <packing>
-          <property name="pack_type">start</property>
-        </packing>
-      </child>
-      <child>
-        <object class="GtkButton" id="shuffle">
-          <property name="visible">True</property>
-          <property name="can_focus">True</property>
-          <property name="receives_default">True</property>
-          <property name="no-show-all">True</property>
-          <property name="label" translatable="yes">Shuffle</property>
-          <child internal-child="accessible">
-            <object class="AtkObject" id="shuffle-atkobject">
-              <property name="AtkObject::accessible-name" translatable="yes">Shuffle</property>
-            </object>
-         </child>
-          <style>
-            <class name="image-button"/>
-          </style>
-        </object>
-        <packing>
-          <property name="pack_type">start</property>
-        </packing>
-      </child>
-      <child>
-        <object class="GtkButton" id="delete">
-          <property name="visible">True</property>
-          <property name="can_focus">True</property>
-          <property name="receives_default">True</property>
-	  <property name="no-show-all">True</property>
-	  <property name="label" translatable="yes">Delete</property>
-          <child internal-child="accessible">
-            <object class="AtkObject" id="delete-atkobject">
-              <property name="AtkObject::accessible-name" translatable="yes">Delete</property>
-            </object>
-         </child>
-          <style>
-            <class name="image-button"/>
-          </style>
-        </object>
-        <packing>
-          <property name="pack_type">end</property>
-        </packing>
-      </child>
+    <child>
+      <object class="GtkActionBar">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkButton" id="add_to_fav">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="no-show-all">True</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="add-to-fav-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Add to Favourites</property>
+              </object>
+            </child>
+            <style>
+              <class name="image-button" />
+            </style>
+            <child>
+              <object class="GtkImage" id="add_to_fav_image">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">emblem-favorite-symbolic</property>
+                <property name="icon_size">1</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="play">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="no-show-all">True</property>
+            <property name="label" translatable="yes" context="button">Play</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="play-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Play</property>
+              </object>
+            </child>
+            <style>
+              <class name="image-button" />
+            </style>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="shuffle">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="no-show-all">True</property>
+            <property name="label" translatable="yes">Shuffle</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="shuffle-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Shuffle</property>
+              </object>
+            </child>
+            <style>
+              <class name="image-button" />
+            </style>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="delete">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="no-show-all">True</property>
+            <property name="label" translatable="yes">Delete</property>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="delete-atkobject">
+                <property name="AtkObject::accessible-name" translatable="yes">Delete</property>
+              </object>
+            </child>
+            <style>
+              <class name="image-button" />
+            </style>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+      </object>
+    </child>
   </template>
 </interface>