aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--data/default-prefs-common.js1
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp3
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b5be865f8..7e7e6d1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-08-21 Christian Persch <chpe@cvs.gnome.org>
+ * data/default-prefs-common.js:
+ * embed/mozilla/mozilla-embed-single.cpp:
+
+ Don't use ext handler for ftp://.
+
+2005-08-21 Christian Persch <chpe@cvs.gnome.org>
+
* lib/ephy-file-helpers.c: (ephy_file_launch_handler):
Change a g_return_if_fail into a regular return.
diff --git a/data/default-prefs-common.js b/data/default-prefs-common.js
index b24025d6f..f95884b97 100644
--- a/data/default-prefs-common.js
+++ b/data/default-prefs-common.js
@@ -99,6 +99,7 @@ pref("font.size.variable.x-unicode", 11);
pref("font.size.variable.x-western", 11);
// protocols
+pref("network.protocol-handler.external.ftp", false);
pref("network.protocol-handler.external.news", true);
pref("network.protocol-handler.external.mailto", true);
pref("network.protocol-handler.external.irc", true);
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 9d90d0626..507291a4b 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -250,8 +250,7 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes)
#endif
/* Open ftp uris with an external handler if one is setup */
- pref->SetBoolPref("network.protocol-handler.external.ftp",
- have_gnome_url_handler ("ftp"));
+ pref->SetBoolPref ("network.protocol-handler.external.ftp", PR_FALSE);
return TRUE;
}