Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 94144abaabac23eecddc9c8ce71f67c1 > files > 11

xulrunner-1.9.0.14-0.1mdv2009.0.src.rpm

diff -Naur mozilla/xpcom/io/nsAppFileLocationProvider.cpp mozilla.tpg/xpcom/io/nsAppFileLocationProvider.cpp
--- mozilla/xpcom/io/nsAppFileLocationProvider.cpp	2007-02-21 19:45:48.000000000 +0000
+++ mozilla.tpg/xpcom/io/nsAppFileLocationProvider.cpp	2008-07-19 10:05:23.000000000 +0000
@@ -205,6 +205,16 @@
         if (NS_SUCCEEDED(rv))
             rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
     }
+    else if (nsCRT::strcmp(prop, "/usr/lib64/mozilla/plugins") == 0)
+    {
+        rv = NS_NewNativeLocalFile(nsDependentCString("/usr/lib64/mozilla/plugins"), PR_TRUE, getter_AddRefs(localFile));
+    }
+    else if (nsCRT::strcmp(prop, "/usr/lib/mozilla/plugins") == 0)
+    {
+        rv = NS_NewNativeLocalFile(nsDependentCString("/usr/lib/mozilla/plugins"), PR_TRUE, getter_AddRefs(localFile));
+    }
+
+    
 #ifdef XP_MACOSX
     else if (nsCRT::strcmp(prop, NS_MACOSX_USER_PLUGIN_DIR) == 0)
     {
@@ -596,7 +606,7 @@
 
         *_retval = new nsAppDirectoryEnumerator(this, keys);
 #else
-        static const char* keys[] = { nsnull, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
+        static const char* keys[] = { nsnull, "/usr/lib64/mozilla/plugins", "/usr/lib/mozilla/plugins", NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
         if (!keys[0] && !(keys[0] = PR_GetEnv("MOZ_PLUGIN_PATH"))) {
             static const char nullstr = 0;
             keys[0] = &nullstr;