aboutsummaryrefslogtreecommitdiff
path: root/x11/gdm/files
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-12-07 05:13:25 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-12-07 05:13:25 +0000
commitd9ebbf82f46418431b1b872e602096dc08d58949 (patch)
treef4e5e911cbfb674b163406c6c3464fecd25c1fcb /x11/gdm/files
parenta7d17ece82dee437953e4ce0607835eeec668b6e (diff)
downloadports-d9ebbf82f46418431b1b872e602096dc08d58949.tar.gz
ports-d9ebbf82f46418431b1b872e602096dc08d58949.zip
Notes
Diffstat (limited to 'x11/gdm/files')
-rw-r--r--x11/gdm/files/patch-daemon_gdm-session-direct.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/x11/gdm/files/patch-daemon_gdm-session-direct.c b/x11/gdm/files/patch-daemon_gdm-session-direct.c
deleted file mode 100644
index a0a84216cc29..000000000000
--- a/x11/gdm/files/patch-daemon_gdm-session-direct.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- daemon/gdm-session-direct.c.orig 2009-12-02 15:15:33.000000000 +0100
-+++ daemon/gdm-session-direct.c 2009-12-02 15:15:41.000000000 +0100
-@@ -608,6 +608,7 @@
- char **devices;
- int n_devices;
- char *layout;
-+ char *variant;
- char *result;
-
- result = NULL;
-@@ -635,8 +636,26 @@
- "input.xkb.layout",
- NULL);
- }
-- result = g_strdup (layout);
-+
-+ variant = libhal_device_get_property_string (ctx,
-+ devices[0],
-+ "input.x11_options.XkbVariant",
-+ NULL);
-+
-+ if (!variant) {
-+ variant = libhal_device_get_property_string (ctx,
-+ devices[0],
-+ "input.xkb.variant",
-+ NULL);
-+ }
-+
-+ if(layout && variant)
-+ result = g_strdup_printf("%s\t%s", layout, variant);
-+ else
-+ result = g_strdup (layout);
-+
- libhal_free_string (layout);
-+ libhal_free_string (variant);
- }
-
- libhal_free_string_array (devices);
-
-