[gnome-clocks/wip/exalm/libhandy: 3/3] Port to libhandy 1.0



commit cbbaf791451e3ca793616f4b98c860966b2db3ee
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri May 22 23:03:54 2020 +0500

    Port to libhandy 1.0

 build-aux/flatpak/org.gnome.clocks.json | 3 +--
 data/ui/alarmdaypickerrow.ui            | 2 +-
 data/ui/alarmsetupdialog.ui             | 2 +-
 meson.build                             | 2 +-
 src/main.vala                           | 2 --
 src/meson.build                         | 1 +
 6 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.clocks.json b/build-aux/flatpak/org.gnome.clocks.json
index 04120e9..abd66db 100644
--- a/build-aux/flatpak/org.gnome.clocks.json
+++ b/build-aux/flatpak/org.gnome.clocks.json
@@ -95,8 +95,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/libhandy.git";,
-                    "branch": "libhandy-0-0"
+                    "url": "https://gitlab.gnome.org/GNOME/libhandy.git";
                 }
             ]
         },
diff --git a/data/ui/alarmdaypickerrow.ui b/data/ui/alarmdaypickerrow.ui
index 630bdf8..9313f18 100644
--- a/data/ui/alarmdaypickerrow.ui
+++ b/data/ui/alarmdaypickerrow.ui
@@ -6,7 +6,7 @@
     <property name="use-underline">True</property>
     <property name="activatable">False</property>
     <property name="selectable">False</property>
-    <child type="action">
+    <child>
      <object class="GtkFlowBox" id="flow">
         <property name="visible">True</property>
         <property name="valign">center</property>
diff --git a/data/ui/alarmsetupdialog.ui b/data/ui/alarmsetupdialog.ui
index 0e8e4be..97137e5 100644
--- a/data/ui/alarmsetupdialog.ui
+++ b/data/ui/alarmsetupdialog.ui
@@ -142,7 +142,7 @@
                         <property name="selectable">False</property>
                         <property name="title" translatable="yes">Name</property>
                         <property name="subtitle" translatable="yes">Optional</property>
-                        <child type="action">
+                        <child>
                           <object class="GtkEntry" id="name_entry">
                             <property name="visible">True</property>
                             <property name="valign">center</property>
diff --git a/meson.build b/meson.build
index 3d3d03b..7374fa2 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ gweather = dependency('gweather-3.0', version: '>=3.32.0')
 gnomedesktop = dependency('gnome-desktop-3.0', version: '>=3.8')
 geocodeglib = dependency('geocode-glib-1.0', version: '>=1.0')
 libgeoclue = dependency('libgeoclue-2.0', version: '>=2.4')
-libhandy = dependency ('libhandy-0.0', version: '>= 0.0.10',
+libhandy = dependency ('libhandy-1', version: '>= 0.80.0',
                        fallback: ['libhandy', 'libhandy_dep'])
 
 cc = meson.get_compiler('c')
diff --git a/src/main.vala b/src/main.vala
index 4e7e396..97d3350 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -24,8 +24,6 @@ int main (string[] args) {
 
     Environment.set_application_name (_("Clocks"));
 
-    Hdy.init (ref args);
-
     var app = new Clocks.Application ();
     return app.run (args);
 }
diff --git a/src/meson.build b/src/meson.build
index 8ddd6ca..7e08e15 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -35,6 +35,7 @@ clocks_vala_args = [
   '--vapidir', meson.current_source_dir(),
   '--gresources', resource_files,
   '--enable-experimental-non-null',
+  '--disable-since-check',
 ]
 
 clocks_c_args = [


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]