From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 10 Sep 2012 19:10:20 +0200
Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d
 (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot
---
 Source/WebCore/plugins/PluginDatabase.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/plugins/PluginDatabase.cpp')

diff --git a/Source/WebCore/plugins/PluginDatabase.cpp b/Source/WebCore/plugins/PluginDatabase.cpp
index e021bad0e..961c45485 100644
--- a/Source/WebCore/plugins/PluginDatabase.cpp
+++ b/Source/WebCore/plugins/PluginDatabase.cpp
@@ -36,6 +36,10 @@
 #include <stdlib.h>
 #include <wtf/text/CString.h>
 
+#if PLATFORM(BLACKBERRY)
+#include <BlackBerryPlatformSettings.h>
+#endif
+
 namespace WebCore {
 
 typedef HashMap<String, RefPtr<PluginPackage> > PluginPackageByNameMap;
@@ -429,7 +433,7 @@ bool PluginDatabase::isPreferredPluginDirectory(const String& path)
     String preferredPath = homeDirectoryPath();
 
 #if PLATFORM(BLACKBERRY)
-    preferredPath = BlackBerry::Platform::Client::get()->getApplicationPluginDirectory().c_str();
+    preferredPath = BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str();
 #elif defined(XP_UNIX)
     preferredPath.append(String("/.mozilla/plugins"));
 #elif defined(XP_MACOSX)
-- 
cgit v1.2.1