[gnome-games/wip/aplazas/libmanette: 7/15] page controllers

[Adrien Plazas <aplazas src gnome org>]

commit 081fe772b8d1952fd6fb4136d03eb54dae91d309
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Mon Nov 6 18:27:44 2017 +0100

    page controllers

 src/ui/preferences-page-controllers.vala |   32 +++++++++++++++++------------
 1 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/src/ui/preferences-page-controllers.vala b/src/ui/preferences-page-controllers.vala
index 4f619a9..23a762f 100644
--- a/src/ui/preferences-page-controllers.vala
+++ b/src/ui/preferences-page-controllers.vala
@@ -12,7 +12,7 @@ private class Games.PreferencesPageControllers: Gtk.Stack, PreferencesPage {
        [GtkChild]
        private Gtk.HeaderBar default_header_bar;
 
-       private GamepadMonitor gamepad_monitor;
+       private Manette.Monitor monitor;
 
        private Binding header_bar_binding;
        private Binding immersive_mode_binding;
@@ -22,9 +22,9 @@ private class Games.PreferencesPageControllers: Gtk.Stack, PreferencesPage {
                header_bar = default_header_bar;
                immersive_mode = false;
 
-               gamepad_monitor = GamepadMonitor.get_instance ();
-               gamepad_monitor.gamepad_unplugged.connect (rebuild_gamepad_list);
-               gamepad_monitor.gamepad_plugged.connect (rebuild_gamepad_list);
+               monitor = new Manette.Monitor ();
+               monitor.device_connected.connect (rebuild_gamepad_list);
+               monitor.device_disconnected.connect (rebuild_gamepad_list);
                build_gamepad_list ();
        }
 
@@ -38,15 +38,17 @@ private class Games.PreferencesPageControllers: Gtk.Stack, PreferencesPage {
        }
 
        private void build_gamepad_list () {
+               Manette.Device device = null;
                var i = 0;
-               gamepad_monitor.foreach_gamepad ((gamepad) => {
+               var iterator = monitor.iterate ();
+               while (iterator.next (out device)) {
                        i += 1;
                        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-                       box.pack_start (new Gtk.Label (gamepad.name), false, false);
+                       box.pack_start (new Gtk.Label (device.get_name ()), false, false);
                        box.margin = 6;
                        box.show_all ();
                        gamepads_list_box.add (box);
-               });
+               };
        }
 
        private void clear_gamepad_list () {
@@ -55,17 +57,21 @@ private class Games.PreferencesPageControllers: Gtk.Stack, PreferencesPage {
 
        [GtkCallback]
        private void gamepads_list_box_row_activated (Gtk.ListBoxRow row_item) {
-               Gamepad? gamepad = null;
+               Manette.Device? device = null;
+               Manette.Device other_device = null;
                var i = 0;
                var row_index = row_item.get_index ();
-               gamepad_monitor.foreach_gamepad ((gamepad_) => {
+
+               var iterator = monitor.iterate ();
+               while (iterator.next (out other_device)) {
                        if (i++ == row_index)
-                               gamepad = gamepad_;
-               });
+                               device = other_device;
+               };
 
-               if (gamepad == null)
+               if (device == null)
                        return;
-               var configurer = new GamepadConfigurer(gamepad);
+
+               var configurer = new GamepadConfigurer(device);
                back_handler_id = configurer.back.connect (on_back);
                header_bar_binding = configurer.bind_property ("header-bar", this, "header-bar",
                                                               BindingFlags.SYNC_CREATE);