diff options
| author | Colin Harrison <colin.harrison@virgin.net> | 2008-11-02 20:17:23 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-01-19 14:50:09 +0000 |
| commit | df3f701ef2d41ff4be4839f473ae71d33777bea3 (patch) | |
| tree | afa149769aa4305b8c846b245dee80b9cec2cfb0 | |
| parent | c612f0df45d388c98108e1e0c80afdfae05e338e (diff) | |
Xming: Ensure we dont try to print a null value when displaying xkb configuration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rw-r--r-- | hw/xwin/winkeybd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index 90cd5af4a..24a7b4393 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -267,9 +267,11 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState) winErrorFVerb(2, "Rules = \"%s\" Model = \"%s\" Layout = \"%s\"" " Variant = \"%s\" Options = \"%s\"\n", - g_winInfo.xkb.rules, g_winInfo.xkb.model, - g_winInfo.xkb.layout, g_winInfo.xkb.variant, - g_winInfo.xkb.options); + g_winInfo.xkb.rules ? g_winInfo.xkb.rules : "none", + g_winInfo.xkb.model ? g_winInfo.xkb.model : "none", + g_winInfo.xkb.layout ? g_winInfo.xkb.layout : "none", + g_winInfo.xkb.variant ? g_winInfo.xkb.variant : "none", + g_winInfo.xkb.options ? g_winInfo.xkb.options : "none"); XkbSetRulesDflts (g_winInfo.xkb.rules, g_winInfo.xkb.model, g_winInfo.xkb.layout, g_winInfo.xkb.variant, |