Skip to content

Remove xapp, use LightDMLayout for keyboard layout changes. #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mtwebster wants to merge 1 commit into from
Closed

Remove xapp, use LightDMLayout for keyboard layout changes. #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 0 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ PKG_CHECK_MODULES(SLICK_GREETER, [
pixman-1
x11
xext
xapp
])

dnl ###########################################################################
Expand Down
2 changes: 0 additions & 2 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,7 +21,6 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
lightdm,
libxapp1,
python3
Suggests: lightdm-remote-session-freerdp,
lightdm-remote-session-uccsconfigure,
Expand Down
1 change: 0 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions src/menubar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,14 +534,13 @@
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;
Expand Down Expand Up @@ -650,7 +649,7 @@
SpawnFlags.SEARCH_PATH,
null,
out reader_pid);
// This is a workaroud for bug https://launchpad.net/bugs/944159

Check failure on line 652 in src/menubar.vala

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22 

workaroud ==> workaround
// The problem is that orca seems to not notice that it's in a
// password field on startup. We just need to kick orca in the
// pants. We do this two ways: a racy way and a non-racy way.
Expand Down
1 change: 0 additions & 1 deletion src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ dependencies = [
pixman_dep,
posix_dep,
x11_dep,
xapp_dep,
xext_dep,
]

Expand Down
Loading