2008-05-13 Ariya Hidayat <ariya.hidayat@trolltech.com>
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 May 2008 14:24:13 +0000 (14:24 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 May 2008 14:24:13 +0000 (14:24 +0000)
        Reviewed by Simon.

        For Gtk/X11 and Qt/X11, use a more extensive plug-ins scan directories set

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@33375 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/plugins/PluginDatabase.cpp

index 540c86c..e214960 100644 (file)
@@ -1,3 +1,13 @@
+2008-05-13  Ariya Hidayat  <ariya.hidayat@trolltech.com>
+
+        Reviewed by Simon.
+
+        For Gtk/X11 and Qt/X11, use a more extensive plug-ins scan directories set
+
+        * plugins/PluginDatabase.cpp:
+        (WebCore::addMozillaPluginDirectories):
+        (WebCore::PluginDatabase::isPreferredPluginDirectory):
+
 2008-05-12  Adam Roben  <aroben@apple.com>
 
         Turn on warnings as errors in WebCore.vcproj
index 18043bc..50bd0a4 100644 (file)
@@ -274,12 +274,33 @@ static void addMozillaPluginDirectories(Vector<String>& paths)
 {
 #if PLATFORM(QT) || defined(GDK_WINDOWING_X11)
     String userPluginPath = homeDirectoryPath();
-    userPluginPath.append(String(".mozilla/plugins"));
+    userPluginPath.append(String("/.mozilla/plugins"));
+    paths.append(userPluginPath);
+
+    userPluginPath = homeDirectoryPath();
+    userPluginPath.append(String("/.netscape/plugins"));
     paths.append(userPluginPath);
 
     paths.append("/usr/lib/browser/plugins");
     paths.append("/usr/local/lib/mozilla/plugins");
+    paths.append("/usr/lib/firefox/plugins");
+    paths.append("/usr/lib64/browser-plugins");
+    paths.append("/usr/lib/browser-plugins");
     paths.append("/usr/lib/mozilla/plugins");
+    paths.append("/usr/local/netscape/plugins");
+    paths.append("/opt/mozilla/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/lib64/netscape/plugins");
+    paths.append("/usr/lib64/mozilla/plugins");
+
+    String mozHome(getenv("MOZILLA_HOME"));
+    mozHome.append("/plugins");
+    paths.append(mozHome);
 
     Vector<String> mozPaths;
     String mozPath(getenv("MOZ_PLUGIN_PATH"));
@@ -314,7 +335,7 @@ Vector<String> PluginDatabase::defaultPluginDirectories()
 bool PluginDatabase::isPreferredPluginDirectory(const String& path)
 {
     String prefPath = homeDirectoryPath();
-    prefPath.append(String(".mozilla/plugins"));
+    prefPath.append(String("/.mozilla/plugins"));
 
     return path == prefPath;
 }