aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphyAboutRedirector.cpp3
-rw-r--r--embed/mozilla/EphyAboutRedirector.h1
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp8
3 files changed, 11 insertions, 1 deletions
diff --git a/embed/mozilla/EphyAboutRedirector.cpp b/embed/mozilla/EphyAboutRedirector.cpp
index faab56850..2a011060b 100644
--- a/embed/mozilla/EphyAboutRedirector.cpp
+++ b/embed/mozilla/EphyAboutRedirector.cpp
@@ -56,7 +56,8 @@ struct RedirEntry {
};
static RedirEntry kRedirMap[] = {
- { "epiphany", "file://" SHARE_DIR "/epiphany.html" },
+ { "epiphany", "file://" SHARE_DIR "/epiphany.xhtml" },
+ { "conspiracy", "file://" SHARE_DIR "/conspiracy.xhtml" },
{ "options", "http://epiphany.mozdev.org/about/options.html" },
{ "marco", "http://mpgritti.oltrelinux.com" }
};
diff --git a/embed/mozilla/EphyAboutRedirector.h b/embed/mozilla/EphyAboutRedirector.h
index 52d3dc76a..cfb919c77 100644
--- a/embed/mozilla/EphyAboutRedirector.h
+++ b/embed/mozilla/EphyAboutRedirector.h
@@ -67,6 +67,7 @@ protected:
#define EPHY_ABOUT_REDIRECTOR_OPTIONS_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "options"
#define EPHY_ABOUT_REDIRECTOR_EPIPHANY_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "epiphany"
+#define EPHY_ABOUT_REDIRECTOR_CONSPIRACY_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "conspiracy"
#define EPHY_ABOUT_REDIRECTOR_MARCO_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "marco"
#define EPHY_ABOUT_REDIRECTOR_CLASSNAME "Epiphany's about redirector"
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index 11cba69b3..8b6aa2142 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -118,6 +118,14 @@ mozilla_register_components (void)
PR_TRUE);
if (NS_FAILED(rv)) ret = FALSE;
+ rv = RegisterFactory (NS_NewEphyAboutRedirectorFactory,
+ kEphyAboutRedirectorCID,
+ EPHY_ABOUT_REDIRECTOR_CLASSNAME,
+ EPHY_ABOUT_REDIRECTOR_CONSPIRACY_CONTRACTID,
+ PR_TRUE);
+ if (NS_FAILED(rv)) ret = FALSE;
+
+
rv = RegisterFactory (NS_NewFtpHandlerFactory, kFtpHandlerCID,
G_FTP_CONTENT_CLASSNAME, G_FTP_CONTENT_CONTRACTID,
PR_TRUE);