From 3bef033e5eedb62e616c402e243fde8f1d1d43ed Mon Sep 17 00:00:00 2001
From: kramo <contact@kramo.hu>
Date: Sat, 16 Sep 2023 09:49:30 +0200
Subject: [PATCH] Newer BLP+Libadwaita syntax/widgets

---
 data/gtk/preferences.blp | 14 ++------------
 data/gtk/window.blp      |  6 +++---
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/data/gtk/preferences.blp b/data/gtk/preferences.blp
index 1db939f..11b65fc 100644
--- a/data/gtk/preferences.blp
+++ b/data/gtk/preferences.blp
@@ -250,23 +250,13 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           }
         }
 
-        Adw.ActionRow flatpak_import_launchers_row {
+        Adw.SwitchRow flatpak_import_launchers_switch {
           title: _("Import Game Launchers");
-          activatable-widget: flatpak_import_launchers_switch;
-
-          Switch flatpak_import_launchers_switch {
-            valign: center;
-          }
         }
       }
 
-      Adw.ActionRow {
+      Adw.SwitchRow desktop_switch {
         title: _("Desktop Entries");
-        activatable-widget: desktop_switch;
-
-        Switch desktop_switch {
-          valign: center;
-        }
       }
     }
   }
diff --git a/data/gtk/window.blp b/data/gtk/window.blp
index dd46b15..83a5738 100644
--- a/data/gtk/window.blp
+++ b/data/gtk/window.blp
@@ -155,7 +155,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
                 [start]
                 Revealer {
                   transition-type: slide_right;
-                  reveal-child: bind-property overlay_split_view.show-sidebar inverted;
+                  reveal-child: bind overlay_split_view.show-sidebar inverted;
                   Button show_sidebar_button {
                     icon-name: "sidebar-show-symbolic";
                     action-name: "win.show_sidebar";
@@ -187,7 +187,7 @@ template $CartridgesWindow : Adw.ApplicationWindow {
 
               [top]
               SearchBar search_bar {
-                search-mode-enabled: bind-property search_button.active bidirectional;
+                search-mode-enabled: bind search_button.active bidirectional;
                 key-capture-widget: library_view;
 
                 Adw.Clamp {
@@ -246,7 +246,7 @@ Adw.NavigationPage hidden_library_page {
 
     [top]
     SearchBar hidden_search_bar {
-      search-mode-enabled: bind-property hidden_search_button.active bidirectional;
+      search-mode-enabled: bind hidden_search_button.active bidirectional;
       key-capture-widget: hidden_library_view;
 
       Adw.Clamp {