aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-05-10 18:57:14 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-05-10 18:57:14 +0800
commit1a9a315b7f892116319bc5b05323f7d98bbccc36 (patch)
treea26512eed9fc7dfb9d5ca76c299d664d26b7a7d2 /src
parentf86f63bb3a32a1b5ce3a6afcaf3c8c825f4533e9 (diff)
downloadgsoc2013-epiphany-1a9a315b7f892116319bc5b05323f7d98bbccc36.tar
gsoc2013-epiphany-1a9a315b7f892116319bc5b05323f7d98bbccc36.tar.gz
gsoc2013-epiphany-1a9a315b7f892116319bc5b05323f7d98bbccc36.tar.bz2
gsoc2013-epiphany-1a9a315b7f892116319bc5b05323f7d98bbccc36.tar.lz
gsoc2013-epiphany-1a9a315b7f892116319bc5b05323f7d98bbccc36.tar.xz
gsoc2013-epiphany-1a9a315b7f892116319bc5b05323f7d98bbccc36.tar.zst
gsoc2013-epiphany-1a9a315b7f892116319bc5b05323f7d98bbccc36.zip
Implement security page. Remove some useless hidden prefs in the process.
2003-05-10 Marco Pesenti Gritti <marco@it.gnome.org> * data/epiphany.schemas.in: * data/glade/prefs-dialog.glade: * embed/ephy-embed-prefs.h: * embed/mozilla/mozilla-notifiers.cpp: * src/language-editor.h: * src/prefs-dialog.c: Implement security page. Remove some useless hidden prefs in the process.
Diffstat (limited to 'src')
-rw-r--r--src/language-editor.h3
-rw-r--r--src/prefs-dialog.c12
2 files changed, 14 insertions, 1 deletions
diff --git a/src/language-editor.h b/src/language-editor.h
index 153fa136a..c4da83028 100644
--- a/src/language-editor.h
+++ b/src/language-editor.h
@@ -19,7 +19,8 @@
#ifndef LANGUAGE_EDITOR_H
#define LANGUAGE_EDITOR_H
-#include "general-prefs.h"
+#include "ephy-dialog.h"
+#include "language-editor.h"
#include <gtk/gtkwidget.h>
#include <glib-object.h>
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 6a9fa6e10..0c02b7fbf 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -215,6 +215,12 @@ enum
USE_COLORS_PROP,
USE_FONTS_PROP,
+ /* Security */
+ ALLOW_POPUPS_PROP,
+ ALLOW_JAVA_PROP,
+ ALLOW_JS_PROP,
+ ACCEPT_COOKIES_PROP,
+
/* Advanced */
CACHE_COMPARE_PROP,
DISK_CACHE_PROP,
@@ -251,6 +257,12 @@ EphyDialogProperty properties [] =
{ USE_COLORS_PROP, "use_colors_checkbutton", CONF_RENDERING_USE_OWN_COLORS, PT_AUTOAPPLY, NULL },
{ USE_FONTS_PROP, "use_fonts_checkbutton", CONF_RENDERING_USE_OWN_FONTS, PT_AUTOAPPLY, NULL },
+ /* Security */
+ { ALLOW_POPUPS_PROP, "popups_allow_checkbutton", CONF_SECURITY_ALLOW_POPUPS, PT_AUTOAPPLY, NULL },
+ { ALLOW_JAVA_PROP, "enable_java_checkbutton", CONF_SECURITY_JAVA_ENABLED, PT_AUTOAPPLY, NULL },
+ { ALLOW_JS_PROP, "enable_javascript_checkbutton", CONF_SECURITY_JAVASCRIPT_ENABLED, PT_AUTOAPPLY, NULL },
+ { ACCEPT_COOKIES_PROP, "cookies_radiobutton", CONF_SECURITY_COOKIES_ACCEPT, PT_AUTOAPPLY, NULL },
+
/* Advanced */
{ CACHE_COMPARE_PROP, "cache_compare_radiobutton", CONF_NETWORK_CACHE_COMPARE, PT_AUTOAPPLY, NULL },
{ DISK_CACHE_PROP, "disk_cache_spin", CONF_NETWORK_DISK_CACHE, PT_AUTOAPPLY, NULL },