[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 2541c78413d561d6fdf0db9026e7325748d12cd1
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 02:48:51 2011 +0000

    Fix build.
    
    * WebProcess/mac/WebProcessMac.mm:
    (WebKit::initializeSandbox):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index dfbece1..8a8ed30 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-24  Anders Carlsson  <andersca at apple.com>
 
+        Fix build.
+        
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::initializeSandbox):
+
+2011-01-24  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Reset the page scale factor on standard frame loads
diff --git a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
index 7fa0194..89d6d3a 100644
--- a/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
+++ b/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
@@ -135,7 +135,7 @@ static void initializeSandbox(const WebProcessCreationParameters& parameters)
         "WEBKIT2_FRAMEWORK_DIR", frameworkPath,
         "DARWIN_USER_TEMP_DIR", (const char*)tmpRealPath,
         "DARWIN_USER_CACHE_DIR", (const char*)cacheRealPath,
-        "WEBKIT_DATABASE_DIR", (const char*)parameters.databaseDirectory.data(),
+        "WEBKIT_DATABASE_DIR", (const char*)[(NSString *)parameters.databaseDirectory fileSystemRepresentation],
         "NSURL_CACHE_DIR", (const char*)parameters.nsURLCachePath.data(),
         "UI_PROCESS_BUNDLE_RESOURCE_DIR", (const char*)parameters.uiProcessBundleResourcePath.data(),
         NULL

-- 
WebKit Debian packaging