debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Always enable HTML5 databases with WebKitGTK+ >= 1.1.14

Browse source 
The infobar will be shown when databases are saved, and it will
be added to the private data dialogue.
This commit is contained in:
Christian Dywan 2010-10-14 01:42:36 +02:00
parent 89c0975e66
commit b5430eeead
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
midori/main.c
View file

@ -1882,6 +1882,9 @@ main (int argc,
error = NULL; error = NULL;
settings = settings_new_from_file (config_file, &extensions); settings = settings_new_from_file (config_file, &extensions);
g_object_set (settings, "enable-developer-extras", TRUE, NULL); 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"); midori_startup_timer ("Config read: \t%f");
/* Load accelerators */ /* Load accelerators */

10
midori/midori-preferences.c
View file

@ -572,13 +572,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
g_free (markup); g_free (markup);
} }
FILLED_ADD (label); 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) #if WEBKIT_CHECK_VERSION (1, 1, 13)
INDENTED_ADD (katze_property_proxy (settings, "enable-offline-web-application-cache", NULL)); INDENTED_ADD (katze_property_proxy (settings, "enable-offline-web-application-cache", NULL));
#endif #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")); FRAME_NEW (_("History"));
button = katze_property_label (settings, "maximum-history-age"); button = katze_property_label (settings, "maximum-history-age");
INDENTED_ADD (button); INDENTED_ADD (button);