Index: trunk/Ohana/src/kii/setup/Ximage.c
===================================================================
--- trunk/Ohana/src/kii/setup/Ximage.c	(revision 2466)
+++ trunk/Ohana/src/kii/setup/Ximage.c	(revision 5637)
@@ -6,16 +6,16 @@
   Layout  layout;
   
+  args (&argc, argv);
+
   bzero (&graphic, sizeof(Graphic));
   bzero (&layout, sizeof(Layout));
 
-  SetUpDisplay (&graphic, &argc, argv);
-  SetUpWindow (&graphic, &argc, argv);
+  if (USE_XWINDOW) SetUpDisplay (&graphic, &argc, argv);
+  if (USE_XWINDOW) SetUpWindow (&graphic, &argc, argv);
 
   DefineLayout (&layout, &graphic, argc, argv);
   EventLoop (&graphic, &layout);
 
-  XFlush (graphic.display);
-  XFreeFont (graphic.display, graphic.font); 
-  CloseDisplay (&graphic);
+  if (USE_XWINDOW) CloseDisplay (&graphic);
   exit (0);
 }