about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRaphael Graf <r@undefined.ch>2011-07-08 14:52:09 +0000
committerRaphael Graf <r@undefined.ch>2011-07-08 14:52:09 +0000
commit90c5cff235150af6f1f955f014f236423844a3f6 (patch)
treea1da4dc6c0d671a448289ec5bbaa5c31f8cf5f6a
parent6485a135e9d0e207e06ebdbb42f7cc93ee03e376 (diff)
downloadxombrero-90c5cff235150af6f1f955f014f236423844a3f6.tar.gz
Disable "Web SQL Database" and add option enable_localstorage.
ok marco@
-rw-r--r--xxxterm.12
-rw-r--r--xxxterm.c9
-rw-r--r--xxxterm.conf3
3 files changed, 14 insertions, 0 deletions
diff --git a/xxxterm.1 b/xxxterm.1
index f70ae9b..95e3c74 100644
--- a/xxxterm.1
+++ b/xxxterm.1
@@ -757,6 +757,8 @@ Using the -n url option on subsequent
 .Nm
 invocations will cause the specified URL to be loaded in a new tab.
 Only a user with identical UID and GID can use this option.
+.It Cm enable_localstorage
+Enable html5 Local Storage.
 .It Cm enable_spell_checking
 Enables spell checking. Preferred languages can be set using 
 .Cm spell_check_languages 
diff --git a/xxxterm.c b/xxxterm.c
index 5a46373..d3b75ac 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -483,6 +483,7 @@ int		enable_socket = 0;
 int		single_instance = 0; /* only allow one xxxterm to run */
 int		fancy_bar = 1;	/* fancy toolbar */
 int		browser_mode = XT_BM_NORMAL;
+int		enable_localstorage = 0;
 
 /* runtime settings */
 int		show_tabs = 1;	/* show tabs on notebook */
@@ -642,6 +643,7 @@ struct settings {
 	{ "enable_js_whitelist",	XT_S_INT, 0,		&enable_js_whitelist, NULL, NULL },
 	{ "enable_plugins",		XT_S_INT, 0,		&enable_plugins, NULL, NULL },
 	{ "enable_scripts",		XT_S_INT, 0,		&enable_scripts, NULL, NULL },
+	{ "enable_localstorage",	XT_S_INT, 0,		&enable_localstorage, NULL, NULL },
 	{ "enable_socket",		XT_S_INT, XT_SF_RESTART,&enable_socket, NULL, NULL },
 	{ "fancy_bar",			XT_S_INT, XT_SF_RESTART,&fancy_bar, NULL, NULL },
 	{ "home",			XT_S_STR, 0, NULL,	&home, NULL },
@@ -1029,6 +1031,7 @@ set_browser_mode(struct settings *s, char *val)
 		session_timeout = 3600;
 		enable_scripts = 0;
 		enable_js_whitelist = 1;
+		enable_localstorage = 0;
 	} else if (!strcmp(val, "normal")) {
 		browser_mode = XT_BM_NORMAL;
 		allow_volatile_cookies = 0;
@@ -1040,6 +1043,7 @@ set_browser_mode(struct settings *s, char *val)
 		session_timeout = 3600;
 		enable_scripts = 1;
 		enable_js_whitelist = 0;
+		enable_localstorage = 1;
 	} else if (!strcmp(val, "kiosk")) {
 		browser_mode = XT_BM_KIOSK;
 		allow_volatile_cookies = 0;
@@ -1051,6 +1055,7 @@ set_browser_mode(struct settings *s, char *val)
 		session_timeout = 3600;
 		enable_scripts = 1;
 		enable_js_whitelist = 0;
+		enable_localstorage = 1;
 		show_tabs = 0;
 		tabless = 1;
 	} else
@@ -7011,6 +7016,10 @@ setup_webkit(struct tab *t)
 	g_object_set(G_OBJECT(t->settings),
 	    "javascript-can-open-windows-automatically", enable_scripts, (char *)NULL);
 	g_object_set(G_OBJECT(t->settings),
+	    "enable-html5-database", FALSE, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
+	    "enable-html5-local-storage", enable_localstorage, (char *)NULL);
+	g_object_set(G_OBJECT(t->settings),
 	    "enable_spell_checking", enable_spell_checking, (char *)NULL);
 	g_object_set(G_OBJECT(t->settings),
 	    "spell_checking_languages", spell_check_languages, (char *)NULL);
diff --git a/xxxterm.conf b/xxxterm.conf
index 1ad5c46..4848693 100644
--- a/xxxterm.conf
+++ b/xxxterm.conf
@@ -19,6 +19,7 @@
 # ssl_ca_file		= /etc/ssl/cert.pem
 # ssl_strict_certs	= 0
 # enable_socket		= 0
+# enable_localstorage	= 0
 # single_instance	= 0
 # save_global_history	= 0
 # show_tabs		= 1
@@ -102,6 +103,7 @@
 # session_timeout		= 3600
 # enable_scripts		= 0
 # enable_js_whitelist		= 1
+# enable_localstorage		= 0
 #
 # the settings for "browser_mode = normal" are as follows
 # allow_volatile_cookies	= 0
@@ -113,6 +115,7 @@
 # session_timeout		= 3600
 # enable_scripts		= 1
 # enable_js_whitelist		= 0
+# enable_localstorage		= 1
 
 # cookie white list
 # cookie_wl		= .conformal.com