From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 3 16:50:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAC1310656C6 for ; Thu, 3 Dec 2009 16:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6F1408FC12 for ; Thu, 3 Dec 2009 16:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nB3Go2O8055314 for ; Thu, 3 Dec 2009 16:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nB3Go23J055313; Thu, 3 Dec 2009 16:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 3 Dec 2009 16:50:02 GMT Resent-Message-Id: <200912031650.nB3Go23J055313@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andreas Wetzel Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EC761065672 for ; Thu, 3 Dec 2009 16:48:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 3E1A78FC19 for ; Thu, 3 Dec 2009 16:48:52 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nB3GmpKp053460 for ; Thu, 3 Dec 2009 16:48:51 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id nB3GmpOM053459; Thu, 3 Dec 2009 16:48:51 GMT (envelope-from nobody) Message-Id: <200912031648.nB3GmpOM053459@www.freebsd.org> Date: Thu, 3 Dec 2009 16:48:51 GMT From: Andreas Wetzel To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/141143: x11/gdm: gdm ignores keyboard variant configured via HAL X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2009 16:50:02 -0000 >Number: 141143 >Category: ports >Synopsis: x11/gdm: gdm ignores keyboard variant configured via HAL >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Dec 03 16:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Andreas Wetzel >Release: 8.0-RELEASE >Organization: >Environment: FreeBSD gunhead.enforcer.cc 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Tue Dec 1 01:19:18 CET 2009 root@gunhead.enforcer.cc:/usr/obj/usr/src/sys/GUNHEAD i386 >Description: gdm reads the keyboard layout from HAL, but ignores the selected keyboard variant, i.e. 'nodeadkeys'. >How-To-Repeat: - Configure a keyboard layout and variant via HAL (input.x11_options.XkbLayout, input.x11_options.XkbVariant) - Start gdm - The keyboard layout field will only contain the layout selected via HAL, not the variant. >Fix: Patch attached with submission follows: --- 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); >Release-Note: >Audit-Trail: >Unformatted: