--- a/DragAndDropManager.st	Wed Sep 03 11:52:12 2008 +0200
+++ b/DragAndDropManager.st	Thu Sep 11 14:39:38 2008 +0200
@@ -1231,7 +1231,7 @@
     ].
 
     MessageNotUnderstood 
-        ignoreNotUnderstoodOf:#'onDevice:' 
+        ignoreNotUnderstoodOf:#onDevice: 
         in:[
             obj := obj onDevice:aDevice
         ].
@@ -1246,25 +1246,25 @@
         ^ obj
     ].
 
-    (obj class == MultiColListEntry) ifFalse:[
-        ^ obj
-    ].
-    s1 := obj colAt:1.
-    s2 := obj colAt:2.
+    (obj class == MultiColListEntry) ifTrue:[
+        s1 := obj colAt:1.
+        s2 := obj colAt:2.
 
-    s1 isImage ifTrue:[
-        s2 isImage  ifTrue:[ ^ self displayObjectFor:(LabelAndIcon form:s1  image:s2) on:aDevice ].
-        s2 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s1 string:s2) on:aDevice ].
-        ^ (s1 on:aDevice) clearMaskedPixels
+        s1 isImage ifTrue:[
+            s2 isImage  ifTrue:[ ^ self displayObjectFor:(LabelAndIcon form:s1  image:s2) on:aDevice ].
+            s2 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s1 string:s2) on:aDevice ].
+            ^ (s1 on:aDevice) clearMaskedPixels
+        ].
+
+        s2 isImage ifTrue:[
+            s1 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s2 string:s1) on:aDevice ].
+            ^ (s2 on:aDevice) clearMaskedPixels
+        ].
+
+        s1 isString ifTrue:[^ s1].
+        s2 isString ifTrue:[^ s2].
     ].
 
-    s2 isImage ifTrue:[
-        s1 isString ifTrue:[ ^ self displayObjectFor:(LabelAndIcon icon:s2 string:s1) on:aDevice ].
-        ^ (s2 on:aDevice) clearMaskedPixels
-    ].
-
-    s1 isString ifTrue:[^ s1].
-    s2 isString ifTrue:[^ s2].
     ^ obj
 !
 
@@ -1640,7 +1640,7 @@
 !DragAndDropManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/DragAndDropManager.st,v 1.82 2008-06-02 11:20:33 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/DragAndDropManager.st,v 1.83 2008-09-11 12:39:38 stefan Exp $'
 ! !
 
 DragAndDropManager initialize!