Commit 1db2afca authored by hausmann@webkit.org's avatar hausmann@webkit.org

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@33375 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a1251b33
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> 2008-05-12 Adam Roben <aroben@apple.com>
Turn on warnings as errors in WebCore.vcproj Turn on warnings as errors in WebCore.vcproj
...@@ -274,12 +274,33 @@ static void addMozillaPluginDirectories(Vector<String>& paths) ...@@ -274,12 +274,33 @@ static void addMozillaPluginDirectories(Vector<String>& paths)
{ {
#if PLATFORM(QT) || defined(GDK_WINDOWING_X11) #if PLATFORM(QT) || defined(GDK_WINDOWING_X11)
String userPluginPath = homeDirectoryPath(); 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(userPluginPath);
paths.append("/usr/lib/browser/plugins"); paths.append("/usr/lib/browser/plugins");
paths.append("/usr/local/lib/mozilla/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/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; Vector<String> mozPaths;
String mozPath(getenv("MOZ_PLUGIN_PATH")); String mozPath(getenv("MOZ_PLUGIN_PATH"));
...@@ -314,7 +335,7 @@ Vector<String> PluginDatabase::defaultPluginDirectories() ...@@ -314,7 +335,7 @@ Vector<String> PluginDatabase::defaultPluginDirectories()
bool PluginDatabase::isPreferredPluginDirectory(const String& path) bool PluginDatabase::isPreferredPluginDirectory(const String& path)
{ {
String prefPath = homeDirectoryPath(); String prefPath = homeDirectoryPath();
prefPath.append(String(".mozilla/plugins")); prefPath.append(String("/.mozilla/plugins"));
return path == prefPath; return path == prefPath;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment