[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ad83108202174a791a6204ba1438beb4e8986ddf
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 10:12:24 2010 +0000

    2010-12-21  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Seidel.
    
            [GTK] minimal build with --database fails
            https://bugs.webkit.org/show_bug.cgi?id=51394
    
            * webkit/webkitprivate.cpp:
            (webkit_init): Use cacheStorage() only if the
            OFFLINE_WEB_APPLICATIONS feature is enabled.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74620 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 2bded53..8a7e979 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-21  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] minimal build with --database fails
+        https://bugs.webkit.org/show_bug.cgi?id=51394
+
+        * webkit/webkitprivate.cpp:
+        (webkit_init): Use cacheStorage() only if the
+        OFFLINE_WEB_APPLICATIONS feature is enabled.
+
 2010-12-22  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index 4652031..3e1ad36 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -129,14 +129,14 @@ void webkit_init()
     // that may only be done by the main thread.
     atomicCanonicalTextEncodingName("UTF-8");
 
-#if ENABLE(DATABASE)
     gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
     webkit_set_web_database_directory_path(databaseDirectory);
 
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     // FIXME: It should be possible for client applications to override the default appcache location
     WebCore::cacheStorage().setCacheDirectory(databaseDirectory);
-    g_free(databaseDirectory);
 #endif
+    g_free(databaseDirectory);
 
     PageGroup::setShouldTrackVisitedLinks(true);
 

-- 
WebKit Debian packaging