summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac2
-rw-r--r--setxkbmap.c4
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d7960b..90b6f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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);
}