xserver: Branch 'server-1.5-branch'
Alan Coopersmith
alanc at kemper.freedesktop.org
Wed Jun 25 18:22:58 PDT 2008
xkb/ddxLoad.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9029748f894e603bd7a963c4b868349dc1a73f5f
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Wed Jun 25 15:06:49 2008 -0700
Don't log null device name in XkbDDXLoadKeymapByNames
(cherry picked from 7ce6dcef118139d0ccfc136b9a07f5bf0c078d70 commit)
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 842c146..35c3a3d 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -351,7 +351,7 @@ unsigned missing;
(names->compat==NULL)&&(names->symbols==NULL)&&
(names->geometry==NULL)) {
LogMessage(X_ERROR, "XKB: No components provided for device %s\n",
- keybd->name);
+ keybd->name ? keybd->name : "(unnamed keyboard)");
return 0;
}
else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
More information about the xorg-commit
mailing list