Sophie

Sophie

distrib > Mandriva > 2007.1 > i586 > by-pkgid > 957da2639ff0ff03ed8e388494a58800 > files > 147

kdebase4-3.80.3-0.20070311.6mdv2007.1.src.rpm

Index: kdebase/kcontrol/konqhtml/pluginopts.h
===================================================================
--- kdebase/kcontrol/konqhtml/pluginopts.h	(revision 604667)
+++ kdebase/kcontrol/konqhtml/pluginopts.h	(working copy)
@@ -140,7 +140,7 @@
 /******************************************************************************/
  protected:
   void dirInit();
-  void dirLoad( KConfig *config );
+  void dirLoad( KConfig *config, bool useDefault = false );
   void dirSave( KConfig *config );
 
  protected slots:
Index: pluginopts.cpp
===================================================================
--- kdebase/kcontrol/konqhtml/pluginopts.cpp	(revision 605612)
+++ kdebase/kcontrol/konqhtml/pluginopts.cpp	(working copy)
@@ -207,7 +207,7 @@
   priority->setValue(100 - KCLAMP(config->readNumEntry("Nice Level", 0), 0, 19) * 5);
   updatePLabel(priority->value());
 
-  dirLoad( config );
+  dirLoad( config, useDefaults );
   pluginLoad( config );
 
   delete config;
@@ -364,14 +364,14 @@
 }
 
 
-void KPluginOptions::dirLoad( KConfig *config )
+void KPluginOptions::dirLoad( KConfig *config, bool useDefault )
 {
     QStringList paths;
 
     // read search paths
 
     config->setGroup("Misc");
-    if ( config->hasKey( "scanPaths" ) )
+    if ( config->hasKey( "scanPaths" ) && !useDefault )
         paths = config->readListEntry( "scanPaths" );
     else {//keep sync with kdebase/nsplugins/pluginscan
         paths.append("$HOME/.mozilla/plugins");