Always enable HTML5 databases with WebKitGTK+ >= 1.1.14

The infobar will be shown when databases are saved, and it will
be added to the private data dialogue.

diff --git a/midori/main.c b/midori/main.c
index 2a0499affd09cbc74a122054ae83aea86db4b291..64a7583e1f2c6a84778cafefa8159c574b566937 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -1882,6 +1882,9 @@ main (int    argc,
     error = NULL;
     settings = settings_new_from_file (config_file, &extensions);
     g_object_set (settings, "enable-developer-extras", TRUE, NULL);
+    #if WEBKIT_CHECK_VERSION (1, 1, 14)
+    g_object_set (settings, "enable-html5-database", TRUE, NULL);
+    #endif
     midori_startup_timer ("Config read: \t%f");
 
     /* Load accelerators */

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 5f591ac880fd9813159fe1f943aad8fea22fe485..86214aeb74ef24e5ca023fc3d0a5d49fff786c4e 100644 (file)
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -572,12 +572,14 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
         g_free (markup);
     }
     FILLED_ADD (label);
+    #if WEBKIT_CHECK_VERSION (1, 1, 13)
+    INDENTED_ADD (katze_property_proxy (settings, "enable-offline-web-application-cache", NULL));
+    #endif
     #if WEBKIT_CHECK_VERSION (1, 1, 8)
-    INDENTED_ADD (katze_property_proxy (settings, "enable-html5-database", NULL));
     SPANNED_ADD (katze_property_proxy (settings, "enable-html5-local-storage", NULL));
+    #if !WEBKIT_CHECK_VERSION (1, 1, 14)
+    INDENTED_ADD (katze_property_proxy (settings, "enable-html5-database", NULL));
     #endif
-    #if WEBKIT_CHECK_VERSION (1, 1, 13)
-    INDENTED_ADD (katze_property_proxy (settings, "enable-offline-web-application-cache", NULL));
     #endif
     FRAME_NEW (_("History"));
     button = katze_property_label (settings, "maximum-history-age");