[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:       2004-07-24 22:04:09
Message-ID: 20040724220409.080FA9A25 () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Bug fix: 85761


  M +18 -6     KioFonts.cpp   1.38


--- kdebase/kcontrol/kfontinst/kio/KioFonts.cpp  #1.37:1.38
@@ -96,4 +96,13 @@ int kdemain(int argc, char **argv)
 }
 
+static QString simplifySlashes(const QString &str)
+{
+    QString ret(str);
+
+    while(-1!=ret.find("//"))
+        ret.replace("//", "/");
+    return ret;
+}
+
 static bool containsGsUseableFonts(const QString &ds)
 {
@@ -189,4 +198,5 @@ static bool createUDSEntry(KIO::UDSEntry
     if(exists || formattedExists)
     {
+#if KDE_IS_VERSION(3,2,90)
         if(file && (CFontEngine::isAFontOrAfm(cPath)))
         {
@@ -217,4 +227,7 @@ static bool createUDSEntry(KIO::UDSEntry
             addAtom(entry, KIO::UDS_URL, 0, url);
         }
+#else
+        addAtom(entry, KIO::UDS_NAME, 0, name);
+#endif
 
         if (S_ISLNK(buff.st_mode))
@@ -315,5 +328,5 @@ static bool createFileEntry(KIO::UDSEntr
 
     if(!err)
-        err=!createUDSEntry(entry, fName, fPath, \
QString(KIO_FONTS_PROTOCOL)+QChar(':')+url, mime, true); +        \
err=!createUDSEntry(entry, fName, fPath, \
QString(KIO_FONTS_PROTOCOL)+QChar(':')+simplifySlashes(url), mime, true);  
     return !err;
@@ -1425,5 +1440,4 @@ void CKioFonts::del(const KURL &url, boo
     QStringList                items;
 
-    KFI_DBUG << "real ";
     for(constIt=list.begin(); constIt!=list.end(); ++constIt)
         if((isFile && CMisc::fExists(*constIt+sub)) ||
@@ -1432,9 +1446,7 @@ void CKioFonts::del(const KURL &url, boo
 
             items.append(*constIt+sub);
-            KFI_DBUG << *constIt+sub;
+            KFI_DBUG << "real: " << *constIt+sub << endl;
         }
 
-    KFI_DBUG << endl;
-
     if(items.count())
         if(isFile)


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