Revert "Revert "Add libhandy-1 to dependencies""

This reverts commit 02c80c1280d9be8cad25027f6a69fa849735f210.

4 files changed, 22 insertions, 1 deletions

diff --git a/meson.build b/meson.build
index daa66f0f..27244958 100644
--- a/meson.build
+++ b/meson.build
@@ -30,6 +30,7 @@ gjs = dependency('gjs-1.0', version: '>= 1.50.0')
 girepository = dependency('gobject-introspection-1.0', version: '>= 0.10.1')
 gtk3 = dependency('gtk+-3.0', version: '>= 3.22.0')
 geoclue2 = dependency('geoclue-2.0', version: '>= 0.12.99')
+handy = dependency('libhandy-1', version: '>= 0.84.0')
 
 libmaps_deps = [
 	dependency('gee-0.8', version: '>= 0.16.0'),
diff --git a/org.gnome.Maps.json b/org.gnome.Maps.json
index 8c58292d..4202a2ed 100644
--- a/org.gnome.Maps.json
+++ b/org.gnome.Maps.json
@@ -208,6 +208,23 @@
             ]
         },
         {
+            "name" : "libhandy",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dgtk_doc=false",
+                "-Dtests=false",
+                "-Dexamples=false",
+                "-Dvapi=false",
+                "-Dglade_catalog=disabled"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/libhandy.git"
+                }
+            ]
+        },
+        {
             "name" : "gnome-maps",
             "buildsystem" : "meson",
             "builddir" : true,
@@ -219,4 +236,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/src/application.js b/src/application.js
index f7a80c51..24692af2 100644
--- a/src/application.js
+++ b/src/application.js
@@ -25,6 +25,7 @@ const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const GtkClutter = imports.gi.GtkClutter;
+const Hdy = imports.gi.Handy;
 const WebKit2 = imports.gi.WebKit2;
 
 const CheckIn = imports.checkIn;
@@ -224,6 +225,7 @@ var Application = GObject.registerClass({
         super.vfunc_startup();
 
         GtkClutter.init(null);
+        Hdy.init();
 
         Utils.loadStyleSheet(Gio.file_new_for_uri('resource:///org/gnome/Maps/application.css'));
 
diff --git a/src/main.js b/src/main.js
index d93f0408..eac48f59 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,6 +37,7 @@ pkg.require({ 'cairo': '1.0',
               'Gtk': '3.0',
               'GtkChamplain': '0.12',
               'GtkClutter': '1.0',
+              'Handy': '1',
               'Rest': '0.7',
               'Soup': '2.4' });