SOURCES: kdebase-nsplugins_dirs.patch - updated

[arekm]

Author: arekm                        Date: Tue Oct  9 08:03:02 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdebase-nsplugins_dirs.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-nsplugins_dirs.patch
diff -u SOURCES/kdebase-nsplugins_dirs.patch:1.10 SOURCES/kdebase-nsplugins_dirs.patch:1.11
--- SOURCES/kdebase-nsplugins_dirs.patch:1.10	Sun Nov 19 13:06:19 2006
+++ SOURCES/kdebase-nsplugins_dirs.patch	Tue Oct  9 10:02:57 2007
@@ -1,10 +1,9 @@
-diff -urbB kdebase-3.5.0.org/kcontrol/konqhtml/pluginopts.cpp kdebase-3.5.0/kcontrol/konqhtml/pluginopts.cpp
---- kdebase-3.5.0.org/kcontrol/konqhtml/pluginopts.cpp	2005-09-10 10:25:11.000000000 +0200
-+++ kdebase-3.5.0/kcontrol/konqhtml/pluginopts.cpp	2005-11-13 20:59:01.337129500 +0100
+--- kdebase/kcontrol/konqhtml/pluginopts.cpp.org	2007-10-09 09:58:45.408911766 +0200
++++ kdebase/kcontrol/konqhtml/pluginopts.cpp	2007-10-09 09:59:40.350918314 +0200
 @@ -374,24 +374,8 @@
      if ( config->hasKey( "scanPaths" ) && !useDefault )
          paths = config->readListEntry( "scanPaths" );
-     else {//keep sync with kdebase/nsplugins/pluginscan
+     else {//keep sync with kdebase/nsplugins
 -        paths.append("$HOME/.mozilla/plugins");
 -        paths.append("$HOME/.netscape/plugins");
 -        paths.append("/usr/lib/firefox/plugins");
@@ -23,17 +22,17 @@
 -	paths.append("/usr/lib64/mozilla/plugins");
 -        paths.append("$MOZILLA_HOME/plugins");
 -
-+        paths.append("/usr/lib/kde3/plugins/konqueror");
-+        paths.append("/usr/lib64/kde3/plugins/konqueror");
++	paths.append("/usr/lib/kde3/plugins/konqueror");
++	paths.append("/usr/lib64/kde3/plugins/konqueror");
      }
  
      // fill list
---- kdebase-3.5.0/nsplugins/pluginscan.cpp~	2006-01-10 05:32:41.000000000 +0200
-+++ kdebase-3.5.0/nsplugins/pluginscan.cpp	2006-01-10 05:32:47.000000000 +0200
-@@ -443,23 +443,8 @@
-     // setup default paths
+--- kdebase/nsplugins/plugin_paths.cpp.org	2007-10-09 10:00:30.832761847 +0200
++++ kdebase/nsplugins/plugin_paths.cpp	2007-10-09 10:00:54.760302272 +0200
+@@ -39,23 +39,8 @@
      if ( !config->hasKey("scanPaths") ) {
          QStringList paths;
+         // keep sync with kdebase/kcontrol/konqhtml
 -        paths.append("$HOME/.mozilla/plugins");
 -        paths.append("$HOME/.netscape/plugins");
 -        paths.append("/usr/lib/firefox/plugins");
@@ -41,18 +40,18 @@
 -        paths.append("/usr/lib/browser-plugins");
 -        paths.append("/usr/local/netscape/plugins");
 -        paths.append("/opt/mozilla/plugins");
--	paths.append("/opt/mozilla/lib/plugins");
+-        paths.append("/opt/mozilla/lib/plugins");
 -        paths.append("/opt/netscape/plugins");
 -        paths.append("/opt/netscape/communicator/plugins");
 -        paths.append("/usr/lib/netscape/plugins");
 -        paths.append("/usr/lib/netscape/plugins-libc5");
 -        paths.append("/usr/lib/netscape/plugins-libc6");
 -        paths.append("/usr/lib/mozilla/plugins");
--	paths.append("/usr/lib64/netscape/plugins");
--	paths.append("/usr/lib64/mozilla/plugins");
+-        paths.append("/usr/lib64/netscape/plugins");
+-        paths.append("/usr/lib64/mozilla/plugins");
 -        paths.append("$MOZILLA_HOME/plugins");
-+		paths.append("/usr/lib/kde3/plugins/konqueror");
-+		paths.append("/usr/lib64/kde3/plugins/konqueror");
++	paths.append("/usr/lib/kde3/plugins/konqueror");
++	paths.append("/usr/lib64/kde3/plugins/konqueror");
          config->writeEntry( "scanPaths", paths );
      }
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdebase-nsplugins_dirs.patch?r1=1.10&r2=1.11&f=u