diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-02-06 12:10:08 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-02-06 12:10:08 +0100 |
commit | 0941cb7f75ac4d248af120efc05ec2412fcb944d (patch) | |
tree | af9e9631b7bf2a3756a2096ae3f519467946be42 /src/menubar.vala | |
parent | e79bf3a819a0c972eeabd3018d412baf0531965b (diff) | |
parent | 5ffd6d93a5f1120f7b2295b377d7a938394a7702 (diff) | |
download | arctica-greeter-0941cb7f75ac4d248af120efc05ec2412fcb944d.tar.gz arctica-greeter-0941cb7f75ac4d248af120efc05ec2412fcb944d.tar.bz2 arctica-greeter-0941cb7f75ac4d248af120efc05ec2412fcb944d.zip |
Merge branch 'sunweaver-pr/ports-from-slick-greeter'
Attributes GH PR #41: https://github.com/ArcticaProject/arctica-greeter/pull/41
Diffstat (limited to 'src/menubar.vala')
-rw-r--r-- | src/menubar.vala | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/menubar.vala b/src/menubar.vala index a417a03..87e0bf7 100644 --- a/src/menubar.vala +++ b/src/menubar.vala @@ -536,9 +536,17 @@ public class MenuBar : Gtk.MenuBar try { string[] argv; + string cmd; int onboard_stdout_fd; - - Shell.parse_argv ("onboard --xid", out argv); + var layout = AGSettings.get_string (AGSettings.KEY_ONSCREEN_KEYBOARD_LAYOUT); + var file = File.new_for_path ("/usr/share/onboard/layouts/%s.onboard".printf (layout)); + if (file.query_exists ()) { + cmd = "onboard --xid --layout='/usr/share/onboard/layouts/%s.onboard'".printf (layout); + } + else { + cmd = "onboard --xid"; + } + Shell.parse_argv (cmd, out argv); Process.spawn_async_with_pipes (null, argv, null, |