SOURCES (djurban-snapshots): kdebase-nsplugins_dirs.patch - update...

[djurban]

Author: djurban                      Date: Wed Jun 22 15:05:14 2005 GMT
Module: SOURCES                       Tag: djurban-snapshots
---- Log message:
- updated, added one more dir

---- Files affected:
SOURCES:
   kdebase-nsplugins_dirs.patch (1.6 -> 1.6.4.1) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-nsplugins_dirs.patch
diff -u SOURCES/kdebase-nsplugins_dirs.patch:1.6 SOURCES/kdebase-nsplugins_dirs.patch:1.6.4.1
--- SOURCES/kdebase-nsplugins_dirs.patch:1.6	Tue Aug 10 04:08:40 2004
+++ SOURCES/kdebase-nsplugins_dirs.patch	Wed Jun 22 17:05:09 2005
@@ -1,12 +1,17 @@
---- kdebase/kcontrol/konqhtml/pluginopts.cpp.orig	2004-03-23 14:55:09.000000000 +0100
-+++ kdebase/kcontrol/konqhtml/pluginopts.cpp	2004-03-23 15:17:25.182487976 +0100
-@@ -352,21 +352,7 @@
+--- kdebase/kcontrol/konqhtml/pluginopts.cpp.orig	2005-06-20 19:36:08.000000000 +0200
++++ kdebase/kcontrol/konqhtml/pluginopts.cpp	2005-06-22 14:29:51.000000000 +0200
+@@ -392,22 +392,12 @@
      if ( config->hasKey( "scanPaths" ) )
          paths = config->readListEntry( "scanPaths" );
      else {//keep sync with kdebase/nsplugins/pluginscan
+-        paths.append("$HOME/.mozilla/plugins");
 -        paths.append("$HOME/.netscape/plugins");
--        paths.append("/usr/lib64/browser-plugins");
--        paths.append("/usr/lib/browser-plugins");
++	paths.append("/usr/lib/kde3/plugins/konqueror");
++	paths.append("/usr/lib64/kde3/plugins/konqueror");
++	paths.append("$HOME/.kde/lib/plugins/konqueror");
++	paths.append("$HOME/.kde/lib64/plugins/konqueror");
+         paths.append("/usr/lib64/browser-plugins");
+         paths.append("/usr/lib/browser-plugins");
 -        paths.append("/usr/local/netscape/plugins");
 -        paths.append("/opt/mozilla/plugins");
 -	paths.append("/opt/mozilla/lib/plugins");
@@ -19,16 +24,16 @@
 -	paths.append("/usr/lib64/netscape/plugins");
 -	paths.append("/usr/lib64/mozilla/plugins");
 -        paths.append("$MOZILLA_HOME/plugins");
-+        paths.append("/usr/lib/kde3/plugins/konqueror");
      }
  
      // fill list
---- kdebase/nsplugins/pluginscan.cpp.orig	2004-03-23 14:57:02.000000000 +0100
-+++ kdebase/nsplugins/pluginscan.cpp	2004-03-23 15:15:28.117284592 +0100
-@@ -441,20 +441,7 @@
+--- kdebase/nsplugins/pluginscan.cpp.orig	2005-06-20 19:39:55.000000000 +0200
++++ kdebase/nsplugins/pluginscan.cpp	2005-06-22 14:31:31.000000000 +0200
+@@ -443,22 +443,12 @@
      // setup default paths
      if ( !config->hasKey("scanPaths") ) {
          QStringList paths;
+-        paths.append("$HOME/.mozilla/plugins");
 -        paths.append("$HOME/.netscape/plugins");
 -        paths.append("/usr/lib64/browser-plugins");
 -        paths.append("/usr/lib/browser-plugins");
@@ -43,7 +48,13 @@
 -        paths.append("/usr/lib/mozilla/plugins");
 -	paths.append("/usr/lib64/netscape/plugins");
 -	paths.append("/usr/lib64/mozilla/plugins");
-+        paths.append("/usr/lib/kde3/plugins/konqueror");
-         paths.append("$MOZILLA_HOME/plugins");
+-        paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/lib/kde3/plugins/konqueror");
++	paths.append("/usr/lib64/kde3/plugins/konqueror");
++	paths.append("$HOME/.kde/lib/plugins/konqueror");
++	paths.append("$HOME/.kde/lib64/plugins/konqueror");
++	paths.append("/usr/lib64/browser-plugins");
++	paths.append("/usr/lib/browser-plugins");
          config->writeEntry( "scanPaths", paths );
      }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-nsplugins_dirs.patch?r1=1.6&r2=1.6.4.1&f=u