From 5cfe2240ce3bfd7404416f428f962dce9ec25e1c Mon Sep 17 00:00:00 2001
From: mimi89999 <michel@lebihan.pl>
Date: Sun, 11 Oct 2020 21:55:07 +0200
Subject: [PATCH] Update to libhandy 1.0

---
 cmake/FindHandy.cmake             | 12 ++++++------
 main/data/unified_main_content.ui |  3 +--
 main/src/ui/main_window.vala      | 11 +++++------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/cmake/FindHandy.cmake b/cmake/FindHandy.cmake
index 73206a2c..49148f0f 100644
--- a/cmake/FindHandy.cmake
+++ b/cmake/FindHandy.cmake
@@ -1,11 +1,11 @@
 include(PkgConfigWithFallback)
 find_pkg_config_with_fallback(Handy
-        PKG_CONFIG_NAME libhandy-0.0
-        LIB_NAMES libhandy-0.0
-        INCLUDE_NAMES handy.h
-        )
+    PKG_CONFIG_NAME libhandy-1
+    LIB_NAMES libhandy-1
+    INCLUDE_NAMES handy.h
+)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Handy
-        REQUIRED_VARS Handy_LIBRARY
-        VERSION_VAR Handy_VERSION)
+    REQUIRED_VARS Handy_LIBRARY
+    VERSION_VAR Handy_VERSION)
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
index d96a7b18..31493492 100644
--- a/main/data/unified_main_content.ui
+++ b/main/data/unified_main_content.ui
@@ -4,8 +4,7 @@
         <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="mode-transition-type">slide</property>
-        <property name="child-transition-type">slide</property>
+        <property name="transition-type">slide</property>
         <child>
             <object class="GtkStack" id="left_stack">
                 <property name="visible">True</property>
diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala
index 080f338c..9577a5de 100644
--- a/main/src/ui/main_window.vala
+++ b/main/src/ui/main_window.vala
@@ -51,9 +51,8 @@ public class MainWindow : Gtk.Window {
         setup_headerbar();
         setup_stack();
 
-        paned.bind_property("mode-transition-type", headerbar_paned, "mode-transition-type", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
+        paned.bind_property("transition-type", headerbar_paned, "transition-type", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
         paned.bind_property("mode-transition-duration", headerbar_paned, "mode-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
-        paned.bind_property("child-transition-type", headerbar_paned, "child-transition-type", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
         paned.bind_property("child-transition-duration", headerbar_paned, "child-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
         paned.bind_property("visible-child-name", headerbar_paned, "visible-child-name", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
     }
@@ -61,7 +60,7 @@ public class MainWindow : Gtk.Window {
     private void setup_unified() {
         Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui");
         paned = (Hdy.Leaflet) builder.get_object("paned");
-        paned.notify["fold"].connect_after(() => update_headerbar());
+        paned.notify["folded"].connect_after(() => update_headerbar());
         box.add(paned);
         left_stack = (Stack) builder.get_object("left_stack");
         right_stack = (Stack) builder.get_object("right_stack");
@@ -77,13 +76,13 @@ public class MainWindow : Gtk.Window {
 
     private void update_headerbar() {
         if (!Util.use_csd()) return;
-        conversation_titlebar_csd.back_button = headerbar_paned.fold == Hdy.Fold.FOLDED;
+        conversation_titlebar_csd.back_button = headerbar_paned.folded;
         set_window_buttons();
     }
 
     private void show_list_pane() {
         paned.visible_child_name = "list-pane";
-        if (headerbar_paned.fold == Hdy.Fold.FOLDED) {
+        if (headerbar_paned.folded) {
             conversation_selector.unselect_row(conversation_selector.get_selected_row());
         }
     }
@@ -131,7 +130,7 @@ public class MainWindow : Gtk.Window {
         Gtk.Settings? gtk_settings = Gtk.Settings.get_default();
         if (gtk_settings == null) return;
 
-        if (headerbar_paned.fold == Hdy.Fold.FOLDED) {
+        if (headerbar_paned.folded) {
             conversation_list_titlebar_csd.decoration_layout = gtk_settings.gtk_decoration_layout;
             conversation_titlebar_csd.decoration_layout = "";
         } else {