File gdm-keyboard-from-hal.patch of Package gdm

Overview Repositories Revisions Requests Users Attributes Meta

File gdm-keyboard-from-hal.patch of Package gdm

Index: gdm-2.28.0/configure.ac
===================================================================
--- gdm-2.28.0.orig/configure.ac
+++ gdm-2.28.0/configure.ac
@@ -70,6 +70,7 @@ PKG_CHECK_MODULES(DAEMON,
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
         gobject-2.0 >= $GLIB_REQUIRED_VERSION
         gio-2.0 >= $GLIB_REQUIRED_VERSION
+	hal
 )
 AC_SUBST(DAEMON_CFLAGS)
 AC_SUBST(DAEMON_LIBS)
Index: gdm-2.28.0/daemon/gdm-session-direct.c
===================================================================
--- gdm-2.28.0.orig/daemon/gdm-session-direct.c
+++ gdm-2.28.0/daemon/gdm-session-direct.c
@@ -45,6 +45,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include <libhal.h>
+
 #include "gdm-session-direct.h"
 #include "gdm-session.h"
 #include "gdm-session-private.h"
@@ -600,14 +602,66 @@ get_default_language_name (GdmSessionDir
     return setlocale (LC_MESSAGES, NULL);
 }
 
+static char *
+get_system_default_layout (GdmSessionDirect *session)
+{
+    DBusConnection *connection;
+    LibHalContext *ctx;
+    char **devices;
+    int n_devices;
+    char *layout;
+    char *result;
+
+    result = NULL;
+
+    connection = dbus_g_connection_get_connection (session->priv->connection);
+    ctx = libhal_ctx_new ();
+    libhal_ctx_set_dbus_connection (ctx, connection);
+
+    if (!libhal_ctx_init (ctx, NULL)) {
+        goto out;
+    }
+
+    devices = libhal_find_device_by_capability (ctx,
+                                                "input.keyboard",
+                                                &n_devices,
+                                                NULL);
+    if (n_devices > 0) {
+        layout = libhal_device_get_property_string (ctx,
+                                                    devices[0],
+                                                    "input.x11_options.XkbLayout",
+                                                    NULL);
+        if (!layout) {
+            layout = libhal_device_get_property_string (ctx,
+                                                        devices[0],
+                                                        "input.xkb.layout",
+                                                        NULL);
+        }
+	result = g_strdup (layout);
+	libhal_free_string (layout);
+    }
+
+    libhal_free_string_array (devices);
+
+    libhal_ctx_shutdown (ctx, NULL);
+    libhal_ctx_free (ctx);
+
+out:
+    if (!result) {
+        result = g_strdup ("us");
+    }
+
+    return result;
+}
+
 static const char *
 get_default_layout_name (GdmSessionDirect *session)
 {
-    if (session->priv->saved_layout != NULL) {
-                return session->priv->saved_layout;
+    if (!session->priv->saved_layout) {
+        session->priv->saved_layout = get_system_default_layout (session);
     }
 
-    return "us";
+    return session->priv->saved_layout;
 }
 
 static char *
@@ -1970,9 +2024,10 @@ setup_session_environment (GdmSessionDir
 
         if (strcmp (get_layout_name (session),
                     get_default_layout_name (session)) == 0) {
-                gdm_session_direct_set_environment_variable (session,
-                                                             "GDM_KEYBOARD_LAYOUT",
-                                                             get_layout_name (session));
+                if (g_strcmp0 (get_layout_name (session), get_system_default_layout (session)) != 0)
+                    gdm_session_direct_set_environment_variable (session,  
+                                                            "GDM_KEYBOARD_LAYOUT",  
+                                                             get_layout_name (session)); 
         }
 
         gdm_session_direct_set_environment_variable (session,
Index: gdm-2.28.0/daemon/gdm-session-settings.c
===================================================================
--- gdm-2.28.0.orig/daemon/gdm-session-settings.c
+++ gdm-2.28.0/daemon/gdm-session-settings.c
@@ -149,8 +149,7 @@ gdm_session_settings_set_layout_name (Gd
 {
         g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings));
 
-        if (settings->priv->layout_name == NULL ||
-            strcmp (settings->priv->layout_name, layout_name) != 0) {
+        if (g_strcmp0 (settings->priv->layout_name, layout_name) != 0) {
                 settings->priv->layout_name = g_strdup (layout_name);
                 g_object_notify (G_OBJECT (settings), "layout-name");
         }

Places

File gdm-keyboard-from-hal.patch of Package gdm

Places