diff -r 4001d5ec5fcf -r 5e5d008efba2 XWorkstation.st
--- a/XWorkstation.st	Wed Jul 20 16:00:57 2005 +0200
+++ b/XWorkstation.st	Wed Jul 20 19:15:03 2005 +0200
@@ -24,8 +24,8 @@
 		lastEventTime lastButtonPressTime deviceIOTimeoutErrorSignal
 		activateOnClick rawKeySymTranslation selectionOwner selectionTime
 		selectionFetchers selectionHandlers preWaitAction xlibTimeout
-		xlibTimeoutForWindowCreation hasConnectionBroken
-		uniqueDeviceID stxDeviceAtom uuidAtom'
+		xlibTimeoutForWindowCreation hasConnectionBroken uniqueDeviceID
+		stxDeviceAtom uuidAtom'
 	classVariableNames:'RawKeySymTranslation ConservativeSync MaxStringLength
 		DefaultXLibTimeout DefaultXLibTimeoutForWindowCreation'
 	poolDictionaries:''
@@ -10326,9 +10326,11 @@
 
     allChildIDs := OrderedCollection new.
     childIDs := self childIdsOf:aWindowId.
-    allChildIDs addAll:childIDs.
-    childIDs do:[:eachChildId |
-	allChildIDs addAll:(self allChildIdsOf:eachChildId).
+    childIDs notNil ifTrue:[
+        allChildIDs addAll:childIDs.
+        childIDs do:[:eachChildId |
+            allChildIDs addAll:(self allChildIdsOf:eachChildId).
+        ].
     ].
     ^ allChildIDs
 
@@ -10342,20 +10344,20 @@
      deviceIDAtom := (Display atomIDOf:#'STX_DEVICE_ID').
      uuidAtom     := (Display atomIDOf:#'UUID').
      (Display allChildIdsOf:(Display rootWindowId))
-	select:[:id |
-	    |uuid|
-
-	    Display
-		getProperty:deviceIDAtom
-		from:id
-		delete:false
-		into:[:type :value |
-		    type == uuidAtom ifTrue:[
-			uuid := UUID fromBytes:value.
-		    ].
-		].
-	    uuid notNil.
-	]
+        select:[:id |
+            |uuid|
+
+            Display
+                getProperty:deviceIDAtom
+                from:id
+                delete:false
+                into:[:type :value |
+                    type == uuidAtom ifTrue:[
+                        uuid := UUID fromBytes:value.
+                    ].
+                ].
+            uuid notNil.
+        ]
     "
 !
 
@@ -11910,7 +11912,7 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.476 2005-07-20 14:00:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.477 2005-07-20 17:15:03 cg Exp $'
 ! !
 
 XWorkstation initialize!