aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--data/epiphany-lockdown.schemas.in29
2 files changed, 33 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bdf68989b..d62edf8e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2003-11-30 Christian Persch <chpe@cvs.gnome.org>
+ * data/epiphany-lockdown.schemas.in:
+
+ Added disable_unsafe_protocols and additional_safe_protocols keys.
+
+2003-11-30 Christian Persch <chpe@cvs.gnome.org>
+
* configure.in:
* data/glade/epiphany.glade:
* data/glade/prefs-dialog.glade:
diff --git a/data/epiphany-lockdown.schemas.in b/data/epiphany-lockdown.schemas.in
index 7cdbb4ea8..9e44d7a89 100644
--- a/data/epiphany-lockdown.schemas.in
+++ b/data/epiphany-lockdown.schemas.in
@@ -5,7 +5,7 @@
<applyto>/apps/epiphany/lockdown/disable_javascript_chrome</applyto>
<owner>epiphany</owner>
<type>bool</type>
- <default>0</default>
+ <default>false</default>
<locale name="C">
<short>Disable JavaScript chrome control</short>
<long>Disable JavaScript's control over window chrome.</long>
@@ -16,11 +16,36 @@
<applyto>/apps/epiphany/lockdown/hide_menubar</applyto>
<owner>epiphany</owner>
<type>bool</type>
- <default>0</default>
+ <default>false</default>
<locale name="C">
<short>Hide menubar by default</short>
<long>Hide the menubar by default.</long>
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/epiphany/lockdown/disable_unsafe_protocols</key>
+ <applyto>/apps/epiphany/lockdown/disable_unsafe_protocols</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Disable unsafe protocols</short>
+ <long>Disables loading of content from unsafe protocols. Safe protocols
+ are http: and https:.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/epiphany/lockdown/additional_safe_protocols</key>
+ <applyto>/apps/epiphany/lockdown/additional_safe_protocols</applyto>
+ <owner>epiphany</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[]</default>
+ <locale name="C">
+ <short>Additional safe protocols</short>
+ <long>A list of protocols to be considered safe in addition to the
+ default, when disable_unsafe_protocols is enabled.</long>
+ </locale>
+ </schema>
</schemalist>
</gconfschemafile>