[gnome-games/wip/exalm/gtk4: 1/26] fixme: Remove libhandy

[Alexander Mikhaylenko <alexm src gnome org>]

commit 877ac5cd3b84be30db1da5124df4005f54acc76b
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Tue Sep 18 00:25:40 2018 +0500

    fixme: Remove libhandy
    
    Libhandy isn't available for GTK4 yet, so remove it for now and replace
    with stubs.

 data/ui/application-window.ui  |  5 -----
 data/ui/preferences-page.ui    |  7 ++++---
 data/ui/preferences-window.ui  |  2 +-
 flatpak/org.gnome.Games.json   | 16 ----------------
 meson.build                    |  2 --
 src/main.vala                  |  3 ---
 src/meson.build                |  1 -
 src/ui/preferences-window.vala |  8 --------
 8 files changed, 5 insertions(+), 39 deletions(-)
---
diff --git a/data/ui/application-window.ui b/data/ui/application-window.ui
index 443f718e..22b75634 100644
--- a/data/ui/application-window.ui
+++ b/data/ui/application-window.ui
@@ -35,9 +35,6 @@
       </object>
     </child>
     <child type="titlebar">
-      <object class="HdyTitleBar">
-        <property name="visible">True</property>
-        <child>
           <object class="GtkStack" id="header_bar">
             <property name="visible">True</property>
             <child>
@@ -60,8 +57,6 @@
               </packing>
             </child>
           </object>
-        </child>
-      </object>
     </child>
   </template>
 </interface>
diff --git a/data/ui/preferences-page.ui b/data/ui/preferences-page.ui
index c6be5815..941d9cb6 100644
--- a/data/ui/preferences-page.ui
+++ b/data/ui/preferences-page.ui
@@ -10,15 +10,16 @@
           <object class="GtkViewport">
             <property name="visible">True</property>
             <child>
-              <object class="HdyColumn">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="expand">True</property>
-                <property name="maximum-width">600</property>
-                <property name="linear-growth-width">300</property>
+                <property name="width-request">600</property>
+                <property name="halign">center</property>
                 <child>
                   <object class="GtkBox" id="box">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
+                    <property name="hexpand">True</property>
                     <property name="margin">12</property>
                     <property name="spacing">12</property>
                   </object>
diff --git a/data/ui/preferences-window.ui b/data/ui/preferences-window.ui
index 5f7aa5c8..bdc39b1f 100644
--- a/data/ui/preferences-window.ui
+++ b/data/ui/preferences-window.ui
@@ -8,7 +8,7 @@
     <property name="default-height">500</property>
     <property name="window-position">center-on-parent</property>
     <child type="titlebar">
-      <object class="HdyTitleBar" id="titlebar">
+      <object class="GtkBox" id="titlebar">
         <property name="visible">True</property>
         <child>
           <object class="GtkStack" id="titlebar_stack">
diff --git a/flatpak/org.gnome.Games.json b/flatpak/org.gnome.Games.json
index 10f3a633..9947d479 100644
--- a/flatpak/org.gnome.Games.json
+++ b/flatpak/org.gnome.Games.json
@@ -181,22 +181,6 @@
                 }
             ]
         },
-        {
-            "name" : "libhandy",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "--libdir=lib",
-                "-Dtests=false",
-                "-Dexamples=false",
-                "-Dglade_catalog=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://source.puri.sm/Librem5/libhandy.git";
-                }
-            ]
-        },
         {
             "name" : "manette",
             "buildsystem" : "meson",
diff --git a/meson.build b/meson.build
index 3e633689..0f90fbc6 100644
--- a/meson.build
+++ b/meson.build
@@ -36,7 +36,6 @@ gio_dep = dependency ('gio-2.0', version: '>=' + glib_min_version)
 glib_dep = dependency ('glib-2.0', version: '>=' + glib_min_version)
 grilo_dep = dependency ('grilo-0.3')
 gtk_dep = dependency ('gtk+-3.0')
-handy_dep = dependency ('libhandy-0.0')
 manette_dep = dependency ('manette-0.2', version: '>=' + manette_min_version)
 retro_gtk_dep = dependency ('retro-gtk-0.14', version: '>=' + retro_gtk_min_version)
 rsvg_dep = dependency ('librsvg-2.0')
@@ -75,7 +74,6 @@ srcinc = include_directories('src')
 add_project_arguments (
   '-DGETTEXT_PACKAGE="' + meson.project_name () + '"',
   '-DRETRO_GTK_USE_UNSTABLE_API',
-  '-DHANDY_USE_UNSTABLE_API',
   language: 'c'
 )
 
diff --git a/src/main.vala b/src/main.vala
index 7aa30afe..accb61fa 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -7,9 +7,6 @@ int main (string[] args) {
 
        Grl.init (ref args);
 
-       typeof (Hdy.Column).ensure ();
-       typeof (Hdy.TitleBar).ensure ();
-
        var app = new Games.Application ();
        var result = app.run (args);
 
diff --git a/src/meson.build b/src/meson.build
index ac57efbb..301435c6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -199,7 +199,6 @@ vala_sources = [
 
 dependencies = [
   config_dep,
-  handy_dep,
   gio_dep,
   glib_dep,
   grilo_dep,
diff --git a/src/ui/preferences-window.vala b/src/ui/preferences-window.vala
index a91a8b51..09124415 100644
--- a/src/ui/preferences-window.vala
+++ b/src/ui/preferences-window.vala
@@ -2,8 +2,6 @@
 
 [GtkTemplate (ui = "/org/gnome/Games/ui/preferences-window.ui")]
 private class Games.PreferencesWindow : Gtk.Window {
-       [GtkChild]
-       private Hdy.TitleBar titlebar;
        [GtkChild]
        private Gtk.Stack titlebar_stack;
        [GtkChild]
@@ -28,7 +26,6 @@ private class Games.PreferencesWindow : Gtk.Window {
                                previous_subpage = subpage;
                                main_stack.visible_child = content_box;
                                titlebar_stack.visible_child = titlebar_box;
-                               selection_mode_binding.unbind ();
                        }
 
                        if (value != null) {
@@ -37,10 +34,6 @@ private class Games.PreferencesWindow : Gtk.Window {
                                main_stack.add (value);
                                main_stack.visible_child = value;
 
-                               selection_mode_binding = value.bind_property ("request-selection-mode",
-                                                                             titlebar, "selection-mode",
-                                                                             BindingFlags.SYNC_CREATE);
-
                                titlebar_stack.add (header_bar);
                                titlebar_stack.visible_child = header_bar;
                        }
@@ -53,7 +46,6 @@ private class Games.PreferencesWindow : Gtk.Window {
        private PreferencesSubpage previous_subpage;
 
        private Binding subpage_binding;
-       private Binding selection_mode_binding;
 
        public PreferencesWindow () {
                sidebar_row_selected ();