--- libkbdraw/keyboard-drawing.c	2005/08/10 17:31:36	1.1
+++ libkbdraw/keyboard-drawing.c	2005/08/10 17:38:41
@@ -1558,8 +1558,13 @@ keyboard_drawing_init (
                                  XkbGBN_GeometryMask | XkbGBN_KeyNamesMask |
                                  XkbGBN_OtherNamesMask | XkbGBN_SymbolsMask |
                                  XkbGBN_IndicatorMapMask, XkbUseCoreKbd);
-  if (drawing->xkb == NULL)
+  if (drawing->xkb == NULL) {
     g_critical ("XkbGetKeyboard failed to get keyboard from the server!");
+    /* XXX: should we inform the user with an error dialog? Probably the X 
+     * server is broken e.g. because /usr/X11R6/lib/X11/xkb/compiled is not
+     * writeable */
+    return;
+  }
 
   XkbGetNames (drawing->display, XkbAllNamesMask, drawing->xkb);
 
