diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-03-10 09:09:12 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2006-03-10 09:09:12 +0000 |
| commit | 6b195148c00b990923ad5de4d021d4eeacbede68 (patch) | |
| tree | 9ba264c16140a34e05c51c4cd4b1d52052ac4610 | |
| parent | 986fa213931e8d86ff0c1db7d6fe684b1fb92794 (diff) | |
Bump to 1.0.2; release.setxkbmap-1_0_2XORG-7_1XORG-7_0_99_901
Initialise vd.variant and vd.variant to NULL when failing to get the active
RMLVO components from the server.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | setxkbmap.c | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2006-03-10 Daniel Stone <daniel@freedesktop.org> + + * configure.ac: + Bump to 1.0.2; release. + + * setxkbmap.c: + Initialise vd.variant and vd.variant to NULL when failing to get + the active RMLVO components from the server. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index b8ff054..6d415ca 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(setxkbmap,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap) +AC_INIT(setxkbmap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff --git a/setxkbmap.c b/setxkbmap.c index 2c09ddb..76ddafc 100644 --- a/setxkbmap.c +++ b/setxkbmap.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: app/setxkbmap/setxkbmap.c,v 1.2 2004/04/23 19:54:37 eich Exp $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -468,6 +468,8 @@ char * tmp= NULL; tmp = DFLT_XKB_RULES_FILE; vd.model = DFLT_XKB_MODEL; vd.layout = DFLT_XKB_LAYOUT; + vd.variant = NULL; + vd.options = NULL; VMSG3(3,"Use defaults: rules - '%s' model - '%s' layout - '%s'\n", tmp, vd.model, vd.layout); } |