[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst/kio
From:       Craig Drummond <craig () kde ! org>
Date:       2003-10-26 2:37:42
[Download RAW message or body]

CVS commit by craig: 

If adding a folder to Xft that was in X11 (but not Xft), then create fontmap.


  M +7 -8      KioFonts.cpp   1.15


--- kdebase/kcontrol/kfontinst/kio/KioFonts.cpp  #1.14:1.15
@@ -1352,5 +1352,4 @@ void CKioFonts::syncDirs()
     if(inX11NotXft.count())
     {
-#ifdef HAVE_FONTCONFIG
         for(it=inX11NotXft.begin(); it!=inX11NotXft.end(); ++it)
         {
@@ -1359,16 +1358,16 @@ void CKioFonts::syncDirs()
         }
         CGlobal::userXft().apply();
+#ifdef HAVE_FONTCONFIG
         CMisc::doCmd(XFT_CACHE_CMD, CMisc::xDirSyntax(CGlobal::cfg().getUserFontsDir()));
-        for(it=inX11NotXft.begin(); it!=inX11NotXft.end(); ++it)
-            CMisc::setTimeStamps(*it);
 #else
         for(it=inX11NotXft.begin(); it!=inX11NotXft.end(); ++it)
-            CGlobal::userXft().addDir(*it);
-        CGlobal::userXft().apply();
-        for(it=inX11NotXft.begin(); it!=inX11NotXft.end(); ++it)
             CMisc::doCmd(XFT_CACHE_CMD, CMisc::xDirSyntax(*it));
+#endif
         for(it=inX11NotXft.begin(); it!=inX11NotXft.end(); ++it)
+        {
+            CFontmap::createLocal(*it);
             CMisc::setTimeStamps(*it);
-#endif
+        }
+        CFontmap::createTopLevel();
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]