From 19eafd287f10c13d28716fe532b93cd9fae04f33 Mon Sep 17 00:00:00 2001
From: Michael Webster <miketwebster@gmail.com>
Date: Wed, 16 Apr 2025 14:12:59 -0400
Subject: [PATCH] Remove xapp, use LightDMLayout for keyboard layout changes.

---
 .github/workflows/build.yml | 5 +----
 configure.ac                | 1 -
 debian/control              | 2 --
 meson.build                 | 1 -
 src/Makefile.am             | 1 -
 src/menubar.vala            | 7 +++----
 src/meson.build             | 1 -
 7 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1911096b..6965bf7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,4 @@ jobs:
     uses: linuxmint/github-actions/.github/workflows/do-builds.yml@master
     with:
       commit_id: master
-      ############################## Comma separated list - like 'linuxmint/xapp, linuxmint/cinnamon-desktop'
-      dependencies: >
-        linuxmint/xapp
-      ##############################
+      dependencies:
diff --git a/configure.ac b/configure.ac
index 782c1e2e..5f837eb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,6 @@ PKG_CHECK_MODULES(SLICK_GREETER, [
     pixman-1
     x11
     xext
-    xapp
 ])
 
 dnl ###########################################################################
diff --git a/debian/control b/debian/control
index 5d3c6bab..5f93673c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper-compat (= 12),
                liblightdm-gobject-1-dev | liblightdm-gobject-dev,
                liblightdm-gobject-1-dev | lightdm-vala,
                libpixman-1-dev,
-               libxapp-dev,
                meson (>= 0.49.0),
                valac (>= 0.20.0)
 Homepage: https://github.com/linuxmint/slick-greeter
@@ -22,7 +21,6 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          lightdm,
-         libxapp1,
          python3
 Suggests: lightdm-remote-session-freerdp,
           lightdm-remote-session-uccsconfigure,
diff --git a/meson.build b/meson.build
index d65cbde5..ad1ecea7 100644
--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,6 @@ m_dep = cc.find_library('m')
 pixman_dep = dependency('pixman-1')
 posix_dep = meson.get_compiler('vala').find_library('posix')
 x11_dep = dependency('x11')
-xapp_dep = dependency('xapp')
 xext_dep = cc.find_library('Xext')
 
 config_data = configuration_data()
diff --git a/src/Makefile.am b/src/Makefile.am
index 2321c20f..921691ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,6 @@ slick_greeter_VALAFLAGS = \
 	--pkg libcanberra \
 	--pkg gio-2.0 \
 	--pkg pixman-1 \
-	--pkg xapp \
 	--target-glib 2.32
 
 logo_generator_VALAFLAGS = $(slick_greeter_VALAFLAGS)
diff --git a/src/menubar.vala b/src/menubar.vala
index 86d5e53a..f3458d1a 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -534,14 +534,13 @@ public class MenuBar : Gtk.MenuBar
         menu_item.set_submenu (all_menu);
         menu_item.show ();
 
-
-        var xapp_controller = new XApp.KbdLayoutController();
         var display = get_display ();
         var keymap = Gdk.Keymap.get_for_display (display);
         keymap.state_changed.connect (() =>
         {
-            label.set_label(xapp_controller.get_current_short_group_label());
-            item.set_tooltip_text(_("Keyboard layout:").concat(" ").concat(xapp_controller.get_current_name()));
+            var new_layout = LightDM.get_layout();
+            label.set_label(new_layout.name);
+            item.set_tooltip_text(_("Keyboard layout:").concat(" ").concat(new_layout.description));
         });
 
         return item;
diff --git a/src/meson.build b/src/meson.build
index e8f30033..d301ddb9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -47,7 +47,6 @@ dependencies = [
     pixman_dep,
     posix_dep,
     x11_dep,
-    xapp_dep,
     xext_dep,
 ]