diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2004-06-08 20:14:45 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-06-08 20:14:45 +0800 |
| commit | b715d7191fab87c263c34b83f3d41a7ed5b3047a (patch) | |
| tree | 24d8fa7ad0b17c4d8c04b37ecac47eb6ca16862c | |
| parent | ee90d2e1b9f44d3064b23f8a8641a05235161ab7 (diff) | |
| download | gsoc2013-epiphany-b715d7191fab87c263c34b83f3d41a7ed5b3047a.tar gsoc2013-epiphany-b715d7191fab87c263c34b83f3d41a7ed5b3047a.tar.gz gsoc2013-epiphany-b715d7191fab87c263c34b83f3d41a7ed5b3047a.tar.bz2 gsoc2013-epiphany-b715d7191fab87c263c34b83f3d41a7ed5b3047a.tar.lz gsoc2013-epiphany-b715d7191fab87c263c34b83f3d41a7ed5b3047a.tar.xz gsoc2013-epiphany-b715d7191fab87c263c34b83f3d41a7ed5b3047a.tar.zst gsoc2013-epiphany-b715d7191fab87c263c34b83f3d41a7ed5b3047a.zip | |
Move external protocols prefs defaults in the javascript file and add
2004-06-08 Marco Pesenti Gritti <marco@gnome.org>
* data/default-prefs.js:
* embed/mozilla/mozilla-embed-single.cpp:
Move external protocols prefs defaults in
the javascript file and add webcal (Bug #143899)
(backported from HEAD)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | data/default-prefs.js | 5 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 15 |
3 files changed, 17 insertions, 12 deletions
@@ -1,3 +1,12 @@ +2004-06-08 Marco Pesenti Gritti <marco@gnome.org> + + * data/default-prefs.js: + * embed/mozilla/mozilla-embed-single.cpp: + + Move external protocols prefs defaults in + the javascript file and add webcal (Bug #143899) + (backported from HEAD) + 2004-06-07 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/FilePicker.cpp: diff --git a/data/default-prefs.js b/data/default-prefs.js index ad0e52402..1d78793d9 100644 --- a/data/default-prefs.js +++ b/data/default-prefs.js @@ -74,3 +74,8 @@ pref("font.size.variable.tr", 11); pref("font.size.variable.x-unicode", 11); pref("font.size.variable.x-western", 11); +// protocols +pref("network.protocol-handler.external.news", true); +pref("network.protocol-handler.external.mailto", true); +pref("network.protocol-handler.external.irc", true); +pref("network.protocol-handler.external.webcal", true); diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index ed93b4564..01564d034 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -221,18 +221,9 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes) pref->SetCharPref ("general.useragent.vendor", "Epiphany"); pref->SetCharPref ("general.useragent.vendorSub", VERSION); - /* Make sure that Mozilla does not handle these protocols internally */ - pref->SetBoolPref("network.protocol-handler.external.news", TRUE); - pref->SetBoolPref("network.protocol-handler.external.mailto", TRUE); - pref->SetBoolPref("network.protocol-handler.external.irc", TRUE); - if (have_gnome_url_handler ("ftp")) - { - pref->SetBoolPref("network.protocol-handler.external.ftp", TRUE); - } - else - { - pref->SetBoolPref("network.protocol-handler.external.ftp", FALSE); - } + /* Open ftp uris with an external handler if one is setup */ + pref->SetBoolPref("network.protocol-handler.external.ftp", + have_gnome_url_handler ("ftp")); return TRUE; } |