[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d20b2fb68f3f1b5ae39497b07f72e471939481a3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 21:07:50 2009 +0000

    2009-10-05  Priit Laes  <plaes at plaes.org>
    
            Reviewed by Gustavo Noronha.
    
            Add Gentoo-specific paths for searching browser plugins.
            https://bugs.webkit.org/show_bug.cgi?id=30088
    
            * plugins/PluginDatabase.cpp:
            (WebCore::PluginDatabase::defaultPluginDirectories):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e725fc7..9d17932 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-05  Priit Laes  <plaes at plaes.org>
+
+        Reviewed by Gustavo Noronha.
+
+        Add Gentoo-specific paths for searching browser plugins.
+        https://bugs.webkit.org/show_bug.cgi?id=30088
+
+        * plugins/PluginDatabase.cpp:
+        (WebCore::PluginDatabase::defaultPluginDirectories):
+
 2009-10-02  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/plugins/PluginDatabase.cpp b/WebCore/plugins/PluginDatabase.cpp
index f40ed95..4703c9e 100644
--- a/WebCore/plugins/PluginDatabase.cpp
+++ b/WebCore/plugins/PluginDatabase.cpp
@@ -355,6 +355,8 @@ Vector<String> PluginDatabase::defaultPluginDirectories()
     paths.append("/usr/lib/netscape/plugins-libc6");
     paths.append("/usr/lib64/netscape/plugins");
     paths.append("/usr/lib64/mozilla/plugins");
+    paths.append("/usr/lib/nsbrowser/plugins");
+    paths.append("/usr/lib64/nsbrowser/plugins");
 
     String mozHome(getenv("MOZILLA_HOME"));
     mozHome.append("/plugins");

-- 
WebKit Debian packaging