menubar.vala: Use LightDM api for showing the current keyboard

layout.

Remove XApp as a dependency.

Author: mtwebster

.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:

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,

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()

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;

src/meson.build

@@ -47,7 +47,6 @@ dependencies = [
     pixman_dep,
     posix_dep,
     x11_dep,
-    xapp_dep,
     xext_dep,
 ]