[seahorse/wip/nielsdg/libhandy-1] Bump Hdy version to libhandy1




commit 7c8b5605dd97a03e6055839f179b61e58f3252f0
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Nov 7 17:25:53 2020 +0100

    Bump Hdy version to libhandy1
    
    It allows us to build against a stable API, and keeps in sync with the
    other GNOME modules.

 meson.build                 |  2 +-
 src/application.vala        |  4 +++-
 src/key-manager.vala        |  4 ++--
 src/main.vala               |  2 --
 src/seahorse-key-manager.ui | 10 +++++-----
 subprojects/libhandy        |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/meson.build b/meson.build
index f503a20a..c9e21704 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ glib_deps = [
   dependency('gmodule-2.0', version: '>=' + min_glib_version),
 ]
 gtk = dependency('gtk+-3.0', version: '>= 3.22.0')
-libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.12', required: false)
+libhandy_dep = dependency('libhandy-1.0', version: '>= 1.0.0', required: false)
 if not libhandy_dep.found()
   libhandy_subproj = subproject(
     'libhandy',
diff --git a/src/application.vala b/src/application.vala
index 1e9d4362..bcfaacc7 100644
--- a/src/application.vala
+++ b/src/application.vala
@@ -96,8 +96,10 @@ public class Seahorse.Application : Gtk.Application {
     public override void startup() {
         base.startup();
 
+        Hdy.init();
+
         // Insert Icons into Stock
-        icons_init ();
+        icons_init();
 
         // Initialize the backends
         Gkr.Backend.initialize();
diff --git a/src/key-manager.vala b/src/key-manager.vala
index 67299879..5b62fd76 100644
--- a/src/key-manager.vala
+++ b/src/key-manager.vala
@@ -244,7 +244,7 @@ public class Seahorse.KeyManager : Catalog {
     }
 
     private void update_header() {
-        bool folded = this.content_box.fold == Hdy.Fold.FOLDED;
+        bool folded = this.content_box.folded;
 
         this.left_header.show_close_button =
             !folded || header.visible_child == left_header;
@@ -501,7 +501,7 @@ public class Seahorse.KeyManager : Catalog {
 
     [GtkCallback]
     private bool on_key_pressed(Gtk.Widget widget, Gdk.EventKey event) {
-        bool folded = this.content_box.fold == Hdy.Fold.FOLDED;
+        bool folded = this.content_box.folded;
 
         switch (event.keyval) {
           // <Alt>Down and <Alt>Up for easy sidebar navigation
diff --git a/src/main.vala b/src/main.vala
index 49bb1bb0..96d1f9f0 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -24,8 +24,6 @@ public int main (string[] args) {
     Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "UTF-8");
     Intl.textdomain(Config.GETTEXT_PACKAGE);
 
-    Hdy.init (ref args);
-
     Seahorse.Application app = new Seahorse.Application();
     int status = app.run(args);
 
diff --git a/src/seahorse-key-manager.ui b/src/seahorse-key-manager.ui
index 7207617a..26acb24b 100644
--- a/src/seahorse-key-manager.ui
+++ b/src/seahorse-key-manager.ui
@@ -339,7 +339,7 @@
                 </style>
               </object>
               <packing>
-                <property name="allow-visible">False</property>
+                <property name="navigatable">False</property>
               </packing>
             </child>
             <child>
@@ -447,7 +447,7 @@
             </style>
           </object>
           <packing>
-            <property name="allow-visible">False</property>
+            <property name="navigatable">False</property>
           </packing>
         </child>
         <child>
@@ -479,11 +479,11 @@
                     <property name="can_focus">True</property>
                     <property name="hscrollbar-policy">never</property>
                     <child>
-                      <object class="HdyColumn">
+                      <object class="HdyClamp">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="linear-growth-width">400</property>
-                        <property name="maximum-width">800</property>
+                        <property name="tightening-threshold">400</property>
+                        <property name="maximum-size">800</property>
                         <property name="margin-top">12</property>
                         <property name="margin-bottom">12</property>
                         <child>
diff --git a/subprojects/libhandy b/subprojects/libhandy
index aa6b6f43..a7cfd93f 160000
--- a/subprojects/libhandy
+++ b/subprojects/libhandy
@@ -1 +1 @@
-Subproject commit aa6b6f43d505383538a2a3e7b4fcdd6a8ada85ff
+Subproject commit a7cfd93f3c9a85e6af2cd0a581953809e99e5afc


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