[gnome-boxes/libhandy-as-submodule: 3/3] welcome-tutorial: Port to libhandy-1

[Felipe Borges <felipeborges src gnome org>]

commit 16f27aef429e025713d67e42713c479deb1523ad
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue Sep 22 16:19:01 2020 +0200

    welcome-tutorial: Port to libhandy-1
    
    This regresses on the indicator dots.
    
    Since we want to be consistent with gnome-tour, I will address this
    in issue #590.
    
    Fixes: #593

 build-aux/flatpak/org.gnome.Boxes.json | 3 +--
 data/ui/welcome-tutorial.ui            | 3 +--
 src/main.vala                          | 2 +-
 src/meson.build                        | 2 +-
 src/welcome-tutorial.vala              | 2 +-
 subprojects/libhandy                   | 2 +-
 subprojects/libhandy.wrap              | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index 8411cf86..9a323f4c 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -470,8 +470,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://source.puri.sm/Librem5/libhandy.git";,
-                    "branch" : "libhandy-0-0"
+                    "url" : "https://gitlab.gnome.org/gnome/libhandy.git";
                 }
             ]
         },
diff --git a/data/ui/welcome-tutorial.ui b/data/ui/welcome-tutorial.ui
index d47a1e8b..d8ef1e71 100644
--- a/data/ui/welcome-tutorial.ui
+++ b/data/ui/welcome-tutorial.ui
@@ -23,10 +23,9 @@
             <property name="expand">True</property>
 
             <child>
-              <object class="HdyPaginator" id="paginator">
+              <object class="HdyCarousel" id="paginator">
                 <property name="visible">True</property>
                 <property name="animation-duration">400</property>
-                <property name="indicator-style">dots</property>
                 <property name="margin-bottom">12</property>
                 <signal name="notify::position" handler="on_position_changed"/>
 
diff --git a/src/main.vala b/src/main.vala
index 5182ad4d..bd784fe9 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -79,7 +79,7 @@ public int main (string[] args) {
         error (err.message);
     }
 
-    Hdy.init (ref args);
+    Hdy.init ();
 
     var app = new Boxes.App ();
 
diff --git a/src/meson.build b/src/meson.build
index 19e55e20..751ae2d1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -153,7 +153,7 @@ dependencies = [
   valac.find_library ('spice-client-gtk-3.0'),
 ]
 
-libhandy = dependency ('libhandy-0.0', version: '>= 0.0.11', required: false)
+libhandy = dependency ('libhandy-1', version: '>= 1.0.0', required: false)
 if not libhandy.found()
   libhandy = subproject(
     'libhandy',
diff --git a/src/welcome-tutorial.vala b/src/welcome-tutorial.vala
index 1cf1c7d0..2e9f9a12 100644
--- a/src/welcome-tutorial.vala
+++ b/src/welcome-tutorial.vala
@@ -5,7 +5,7 @@
 [GtkTemplate (ui = "/org/gnome/Boxes/ui/welcome-tutorial.ui")]
 private class Boxes.WelcomeTutorial : Gtk.Dialog {
     [GtkChild]
-    private Paginator paginator;
+    private Carousel paginator;
     [GtkChild]
     private Button go_back_button;
     [GtkChild]
diff --git a/subprojects/libhandy b/subprojects/libhandy
index aa6b6f43..0293e21e 160000
--- a/subprojects/libhandy
+++ b/subprojects/libhandy
@@ -1 +1 @@
-Subproject commit aa6b6f43d505383538a2a3e7b4fcdd6a8ada85ff
+Subproject commit 0293e21eeaff3d7f2e230a709a229bab92269197
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
index 5bfca8ba..c8c7a597 100644
--- a/subprojects/libhandy.wrap
+++ b/subprojects/libhandy.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory=libhandy
 url=https://gitlab.gnome.org/gnome/libhandy.git
-revision=libhandy-0-0
+revision=master