--- a/XWorkstation.st	Mon Nov 24 13:47:35 2014 +0000
+++ b/XWorkstation.st	Thu Nov 27 11:15:56 2014 +0000
@@ -7550,26 +7550,30 @@
      next time. The elements of the returned collection are instances of
      FontDescription."
 
-    |names|
+    |names listOfXftFonts|
 
     listOfXFonts isNil ifTrue:[
-	names := self getAvailableFontsMatching:'*'.
-	names isNil ifTrue:[
-	    "no names returned ..."
-	    ^ nil
-	].
-	listOfXFonts := names collect:[:aName | self fontDescriptionFromXFontName:aName].
-	listOfXFonts := FontDescription genericFonts, listOfXFonts.
+        names := self getAvailableFontsMatching:'*'.
+        names isNil ifTrue:[
+            "no names returned ..."
+            ^ nil
+        ].
+        listOfXFonts := names collect:[:aName | self fontDescriptionFromXFontName:aName].
+        listOfXFonts := FontDescription genericFonts, listOfXFonts.
     ].
 
     (XftFontDescription notNil
-	    and:[ XftFontDescription isLoaded
-	    and:[ self supportsXFTFonts ]]
+            and:[ XftFontDescription isLoaded
+            and:[ self supportsXFTFonts ]]
     ) ifTrue:[
-	UserPreferences current useXftFontsOnly ifTrue:[
-	    ^ (XftFontDescription listOfAvailableFonts)
-	].
-	^ listOfXFonts , (XftFontDescription listOfAvailableFonts).
+        UserPreferences current useXFontsOnly ifFalse:[
+            listOfXftFonts := XftFontDescription listOfAvailableFonts.
+
+            UserPreferences current useXftFontsOnly ifTrue:[
+                ^ listOfXftFonts
+            ].
+            ^ listOfXftFonts , listOfXFonts.
+        ].
     ].
     ^ listOfXFonts
 
@@ -13615,11 +13619,11 @@
 !XWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.600 2014-09-22 09:06:27 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.601 2014-11-27 00:11:44 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.600 2014-09-22 09:06:27 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.601 2014-11-27 00:11:44 cg Exp $'
 !
 
 version_HG