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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2010-02-02 20:52:09
Message-ID: 1265143929.942711.2941.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1084283 by craig:

Fix removing of system fonts from font list when kcm is run as root.


 M  +4 -4      FontList.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp #1084282:1084283
@@ -736,7 +736,7 @@
     if(itsSlowUpdates)
         storeSlowedMessage(families, MSG_ADD);
     else
-        addFonts(families.items, families.isSystem);
+        addFonts(families.items, families.isSystem && !Misc::root());
 }
 
 void CFontList::fontsRemoved(const KFI::Families &families)
@@ -745,7 +745,7 @@
     if(itsSlowUpdates)
         storeSlowedMessage(families, MSG_DEL);
     else
-        removeFonts(families.items, families.isSystem);
+        removeFonts(families.items, families.isSystem && !Misc::root());
 }
 
 void CFontList::storeSlowedMessage(const Families &families, EMsgType type)
@@ -795,9 +795,9 @@
         if(!itsSlowedMsgs[i][folder].isEmpty())
         {
             if(MSG_ADD==i)
-                addFonts(itsSlowedMsgs[i][folder], sys);
+                addFonts(itsSlowedMsgs[i][folder], sys && !Misc::root());
             else
-                removeFonts(itsSlowedMsgs[i][folder], sys);
+                removeFonts(itsSlowedMsgs[i][folder], sys && !Misc::root());
             itsSlowedMsgs[i][folder].clear();
         }
 }
[prev in list] [next in list] [prev in thread] [next in thread]