From 1a9a315b7f892116319bc5b05323f7d98bbccc36 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sat, 10 May 2003 10:57:14 +0000 Subject: Implement security page. Remove some useless hidden prefs in the process. 2003-05-10 Marco Pesenti Gritti * 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. --- ChangeLog | 12 ++ data/epiphany.schemas.in | 46 ++++++ data/glade/prefs-dialog.glade | 273 +++++++++++++++++++++++++++++++++++- embed/ephy-embed-prefs.h | 14 +- embed/mozilla/mozilla-notifiers.cpp | 38 +---- src/language-editor.h | 3 +- src/prefs-dialog.c | 12 ++ 7 files changed, 348 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index e738a319e..e232920d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-05-10 Marco Pesenti Gritti + + * 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. + 2003-05-10 Marco Pesenti Gritti * data/epiphany.schemas.in: diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index 09717145c..883f244de 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -575,6 +575,52 @@ + + /schemas/apps/epiphay/security/cookie_accept + /apps/epiphany/security/cookie_accept + epiphany + int + 0 + + Cookie accept + Where to accept cookies from. Possible values are 0 (anywhere), + 1 (from current server only), 2 (nowhere) + + + + /schemas/apps/epiphany/security/allow_popups + /apps/epiphany/security/allow_popups + epiphany + bool + true + + Allow popups + Allow sites to open new windows using JavaScript (if JavaScript + is enabled). + + + + /schemas/apps/epiphany/security/java_enabled + /apps/epiphany/security/java_enabled + epiphany + bool + 1 + + Enable Java + Enable Java. + + + + /schemas/apps/epiphany/security/javascript_enabled + /apps/epiphany/security/javascript_enabled + epiphany + bool + 1 + + Enable JavaScript + Enable JavaScript. + + diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index 598d95707..f97a22444 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -1700,20 +1700,281 @@ + 12 True False - 0 + 18 - - + + True + False + 6 - - + + + True + <b>Web Content</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + True + Allow popup windows + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Enable _Java + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Enable Java_Script + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + True + - + + True + False + 6 + + + + True + <b>Cookies</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + True + _Always accept + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Accept _from current site only + True + GTK_RELIEF_NORMAL + False + False + True + cookies_radiobutton + + + 0 + False + False + + + + + + True + True + _Never accept + True + GTK_RELIEF_NORMAL + False + False + True + cookies_radiobutton + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + False + True + diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h index 8caa14b07..4582a15a5 100644 --- a/embed/ephy-embed-prefs.h +++ b/embed/ephy-embed-prefs.h @@ -17,16 +17,10 @@ #define CONF_RENDERING_VISITED_LINKS "/apps/epiphany/rendering/visited_link_color" #define CONF_RENDERING_UNVISITED_LINKS "/apps/epiphany/rendering/unvisited_link_color" #define CONF_RENDERING_UNDERLINE_LINKS "/apps/epiphany/rendering/underline_links" -#define CONF_FILTERING_ALLOW_POPUPS "/apps/epiphany/filtering/allow_popups" -#define CONF_FILTERING_IMAGE_LOADING_TYPE "/apps/epiphany/filtering/image_loading_type" -#define CONF_FILTERING_ANIMATE_TYPE "/apps/epiphany/filtering/animate_type" -#define CONF_FILTERING_STATUSBAR_REWRITE "/apps/epiphany/filtering/statusbar_rewrite" -#define CONF_FILTERING_JAVA_ENABLED "/apps/epiphany/filtering/java_enabled" -#define CONF_FILTERING_JAVASCRIPT_ENABLED "/apps/epiphany/filtering/javascript_enabled" -#define CONF_PERSISTENT_COOKIES_BEHAVIOR "/apps/epiphany/filtering/cookie_behavior" -#define CONF_PERSISTENT_COOKIE_WARN "/apps/epiphany/filterin/cookie_warn" -#define CONF_PERSISTENT_COOKIE_LIFETIME "/apps/epiphany/filtering/cookie_lifetime" -#define CONF_PERSISTENT_PASSWORDS_SAVE "/apps/epiphany/filtering/passwords_save" +#define CONF_SECURITY_ALLOW_POPUPS "/apps/epiphany/security/allow_popups" +#define CONF_SECURITY_JAVA_ENABLED "/apps/epiphany/security/java_enabled" +#define CONF_SECURITY_JAVASCRIPT_ENABLED "/apps/epiphany/security/javascript_enabled" +#define CONF_SECURITY_COOKIES_ACCEPT "/apps/epiphany/security/cookie_accept" #define CONF_LANGUAGE_AUTODETECT_CHARSET "/apps/epiphany/rendering/autodetect_charset" #define CONF_LANGUAGE_DEFAULT_CHARSET "/apps/epiphany/rendering/default_charset" #define CONF_RENDERING_DEFAULT_FONT "/apps/epiphany/rendering/default_font" diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp index 8c7364516..52b4d2560 100644 --- a/embed/mozilla/mozilla-notifiers.cpp +++ b/embed/mozilla/mozilla-notifiers.cpp @@ -48,11 +48,6 @@ mozilla_own_fonts_notifier(GConfClient *client, EphyEmbedSingle *single); static void -mozilla_animate_notifier(GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - EphyEmbedSingle *single); -static void generic_mozilla_string_notifier(GConfClient *client, guint cnxn_id, GConfEntry *entry, @@ -139,9 +134,8 @@ static const struct } conversion_table [] = { - { CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"}, - { CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"}, - { CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"}, + { CONF_SECURITY_JAVA_ENABLED, BOOL_PREF, "security.enable_java"}, + { CONF_SECURITY_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"}, { CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"}, { CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"}, { CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"}, @@ -160,10 +154,7 @@ conversion_table [] = { CONF_NETWORK_MEMORY_CACHE, INT_PREF, "browser.cache.memory.capacity"}, { CONF_NETWORK_DISK_CACHE, INT_PREF, "browser.cache.disk.capacity"}, { CONF_NETWORK_CACHE_COMPARE, INT_PREF, "browser.cache.check_doc_frequency"}, - { CONF_PERSISTENT_COOKIE_WARN, BOOL_PREF, "network.cookie.warnAboutCookies"}, - { CONF_PERSISTENT_COOKIES_BEHAVIOR, INT_PREF, "network.cookie.cookieBehavior"}, - { CONF_PERSISTENT_COOKIE_LIFETIME, BOOL_PREF, "network.cookie.lifetime.enabled"}, - { CONF_PERSISTENT_PASSWORDS_SAVE, BOOL_PREF, "signon.rememberSignons"}, + { CONF_SECURITY_COOKIES_ACCEPT, BOOL_PREF, "network.cookie.warnAboutCookies"}, { CONF_RENDERING_USE_SYSTEM_COLORS, BOOL_PREF, "browser.display.use_system_colors"}, { NULL, 0, NULL } }; @@ -177,13 +168,11 @@ custom_notifiers [] = { { CONF_NETWORK_USER_AGENT, (GConfClientNotifyFunc) mozilla_user_agent_notifier }, - { CONF_FILTERING_ANIMATE_TYPE, - (GConfClientNotifyFunc) mozilla_animate_notifier }, { CONF_RENDERING_USE_OWN_COLORS, (GConfClientNotifyFunc) mozilla_own_colors_notifier }, { CONF_RENDERING_USE_OWN_FONTS, (GConfClientNotifyFunc) mozilla_own_fonts_notifier }, - { CONF_FILTERING_ALLOW_POPUPS, + { CONF_SECURITY_ALLOW_POPUPS, (GConfClientNotifyFunc) mozilla_allow_popups_notifier }, { CONF_LANGUAGE_DEFAULT_CHARSET, (GConfClientNotifyFunc) mozilla_default_charset_notifier }, @@ -509,30 +498,13 @@ mozilla_own_fonts_notifier(GConfClient *client, !gconf_value_get_bool(entry->value)); } -static void -mozilla_animate_notifier(GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - EphyEmbedSingle *single) -{ - static const gchar *type[] = - { - "normal", - "once", - "none" - }; - - mozilla_prefs_set_string ("image.animation_mode", - type[gconf_value_get_int(entry->value)]); -} - static void mozilla_allow_popups_notifier(GConfClient *client, guint cnxn_id, GConfEntry *entry, EphyEmbedSingle *single) { - gboolean new_val = eel_gconf_get_boolean(CONF_FILTERING_ALLOW_POPUPS); + gboolean new_val = eel_gconf_get_boolean(CONF_SECURITY_ALLOW_POPUPS); mozilla_prefs_set_boolean ("dom.disable_open_during_load", !new_val); } 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 #include 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 }, -- cgit v1.2.3