[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-12-01 11:31:34
Message-ID: 20041201113134.6F91F1B93F () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Fix crash when deleteing user fonts, and help with kcm's refresh on new fonts.


  M +9 -4      KioFonts.cpp   1.47


--- kdebase/kcontrol/kfontinst/kio/KioFonts.cpp  #1.46:1.47
@@ -70,9 +70,9 @@
 #include <ctype.h>
 
-#define KFI_DBUG kdDebug()
+#define KFI_DBUG kdDebug() << "[" << (int)(getpid()) << "] "
 #undef KFI_DBUG
 #include <qtextstream.h>
 QTextOStream ostr(stderr);
-#define KFI_DBUG ostr
+#define KFI_DBUG ostr << "[" << (int)(getpid()) << "] "
 
 #define MAX_IPC_SIZE   (1024*32)
@@ -642,4 +642,5 @@ CKioFonts::CKioFonts(const QCString &poo
         }
     }
+    reinitFc();
 }
 
@@ -1398,4 +1399,5 @@ void CKioFonts::del(const KURL &url, boo
         }
         else
+        {
             for(it=entries->begin(); it!=end; ++it)
             {
@@ -1423,7 +1425,8 @@ void CKioFonts::del(const KURL &url, boo
                             unlink(QFile::encodeName((*uIt).path()).data());
                     }
-                    modified(itsRoot ? FOLDER_SYS : FOLDER_USER);
                 }
             }
+            modified(itsRoot ? FOLDER_SYS : FOLDER_USER);
+        }
         finished();
     }
@@ -1432,4 +1435,6 @@ void CKioFonts::del(const KURL &url, boo
 void CKioFonts::modified(EFolder folder)
 {
+    KFI_DBUG << "modified(" << (int)folder << ")\n";
+
     if(FOLDER_SYS!=folder || itsCanStorePasswd || itsRoot)
     {


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