From 7ce6dcef118139d0ccfc136b9a07f5bf0c078d70 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 25 Jun 2008 15:06:49 -0700
Subject: [PATCH] Don't log null device name in XkbDDXLoadKeymapByNames

---
 xkb/ddxLoad.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index ade13c3af..d6b5f7589 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,