Attachment 320737 Details for Bug 466675 – a patch

[patch] a patch

default-layout.patch (text/plain), 1.24 KB, created by Matthias Clasen on 2008-10-18 04:54:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2008-10-18 04:54:05 UTC

Size: 1.24 KB

patch

obsolete

>--- gdm-2.24.0/gui/simple-greeter/gdm-layout-chooser-widget.c	2008-09-22 13:01:21.000000000 -0400
>+++ haced/gui/simple-greeter/gdm-layout-chooser-widget.c	2008-10-18 00:42:51.000000000 -0400
>@@ -68,10 +68,6 @@
> 
>         id = gdm_chooser_widget_get_selected_item (GDM_CHOOSER_WIDGET (widget));
> 
>-        if (id == NULL) {
>-                id = g_strdup ("us");
>-        }
>-
>         return id;
> }
> 
>--- gdm-2.24.0/daemon/gdm-session-direct.c	2008-08-21 00:31:47.000000000 -0400
>+++ haced/daemon/gdm-session-direct.c	2008-10-18 00:46:30.000000000 -0400
>@@ -598,6 +598,23 @@
> static const char *
> get_default_layout_name (GdmSessionDirect *session)
> {
>+    gchar *text, *p, *q;
>+    gsize *length;
>+
>+    if (!session->priv->saved_layout) {
>+        if (g_file_get_contents ("/etc/sysconfig/keyboard", &text, &length, NULL)) {
>+            p = strstr (text, "KEYTABLE=\"");
>+            if (p) {
>+                p += strlen ("KEYTABLE=\"");
>+                q = strchr (p, '"');
>+                if (q) {
>+                    session->priv->saved_layout = g_strndup (p, q - p);
>+                }
>+            }
>+            g_free (text);
>+        }
>+    }
>+
>     if (session->priv->saved_layout != NULL) {
>                 return session->priv->saved_layout;
>     }

Actions: View | Diff

Attachments on bug 466675: 320160 | 320161 | 320162 | 320737 | 320840