aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/arctica-greeter.vala13
-rw-r--r--src/config.vapi1
3 files changed, 15 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ec75868..9f16db6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,6 +46,7 @@ arctica_greeter_CFLAGS = \
-DLOCALEDIR=\""$(localedir)"\" \
-DVERSION=\"$(VERSION)\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
+ -DPKGLIBEXECDIR=\""$(pkglibexecdir)"\" \
-DINDICATORDIR=\""$(INDICATORDIR)"\"
logo_generator_CFLAGS = $(arctica_greeter_CFLAGS)
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 94a1eb0..2def301 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -580,6 +580,16 @@ public class ArcticaGreeter
greeter_ready ();
}
+ private static void set_keyboard_layout ()
+ {
+ try {
+ Process.spawn_command_line_sync(Path.build_filename (Config.PKGLIBEXECDIR, "arctica-greeter-set-keyboard-layout"), null, null, null);
+ }
+ catch (Error e){
+ warning ("Error while setting the keyboard layout: %s", e.message);
+ }
+ }
+
private static void activate_numlock ()
{
try {
@@ -651,6 +661,9 @@ public class ArcticaGreeter
if (do_test_mode)
debug ("Running in test mode");
+ /* Set the keyboard layout */
+ set_keyboard_layout ();
+
/* Set the numlock state */
if (AGSettings.get_boolean (AGSettings.KEY_ACTIVATE_NUMLOCK)) {
debug ("Activating numlock");
diff --git a/src/config.vapi b/src/config.vapi
index c2e8d96..1aca0b9 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -6,6 +6,7 @@ namespace Config
public const string VERSION;
public const string INDICATOR_FILE_DIR;
public const string PKGDATADIR;
+ public const string PKGLIBEXECDIR;
public const string INDICATORDIR;
public const string SD_BINARY;
}