From b5430eeead8038412e9a75243238ec401dd2a194 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 14 Oct 2010 01:42:36 +0200 Subject: [PATCH] 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. --- midori/main.c | 3 +++ midori/midori-preferences.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/midori/main.c b/midori/main.c index 2a0499af..64a7583e 100644 --- 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 5f591ac8..86214aeb 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -572,13 +572,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences, g_free (markup); } FILLED_ADD (label); - #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)); - #endif #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) + 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 + #endif FRAME_NEW (_("History")); button = katze_property_label (settings, "maximum-history-age"); INDENTED_ADD (button);