summaryrefslogtreecommitdiff
path: root/setxkbmap.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2006-03-10 09:09:12 +0000
committerDaniel Stone <daniel@fooishbar.org>2006-03-10 09:09:12 +0000
commit6b195148c00b990923ad5de4d021d4eeacbede68 (patch)
tree9ba264c16140a34e05c51c4cd4b1d52052ac4610 /setxkbmap.c
parent986fa213931e8d86ff0c1db7d6fe684b1fb92794 (diff)
Initialise vd.variant and vd.variant to NULL when failing to get the active RMLVO components from the server.
Diffstat (limited to 'setxkbmap.c')
-rw-r--r--setxkbmap.c4
1 files changed, 3 insertions, 1 deletions
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);
}