aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-06-08 06:49:19 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-06-08 06:49:19 +0800
commitbd0c78dbe3da345d5da410c114c0fd417825605d (patch)
treeb490072d27543bbf22e08869b40d58d8b170db25
parent516de2813ef99889cf76c14dc00183fe3459298f (diff)
downloadgsoc2013-epiphany-bd0c78dbe3da345d5da410c114c0fd417825605d.tar
gsoc2013-epiphany-bd0c78dbe3da345d5da410c114c0fd417825605d.tar.gz
gsoc2013-epiphany-bd0c78dbe3da345d5da410c114c0fd417825605d.tar.bz2
gsoc2013-epiphany-bd0c78dbe3da345d5da410c114c0fd417825605d.tar.lz
gsoc2013-epiphany-bd0c78dbe3da345d5da410c114c0fd417825605d.tar.xz
gsoc2013-epiphany-bd0c78dbe3da345d5da410c114c0fd417825605d.tar.zst
gsoc2013-epiphany-bd0c78dbe3da345d5da410c114c0fd417825605d.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)
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp15
2 files changed, 11 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 96e5c5028..6e6fd98d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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)
+
2004-06-07 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/FilePicker.cpp:
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 5e8fb8cb8..522767150 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -217,18 +217,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;
}