aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/EphyAboutRedirector.cpp1
-rw-r--r--embed/mozilla/EphyAboutRedirector.h1
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp7
-rw-r--r--embed/mozilla/MozillaPrivate.cpp1
4 files changed, 10 insertions, 0 deletions
diff --git a/embed/mozilla/EphyAboutRedirector.cpp b/embed/mozilla/EphyAboutRedirector.cpp
index c655b652c..faab56850 100644
--- a/embed/mozilla/EphyAboutRedirector.cpp
+++ b/embed/mozilla/EphyAboutRedirector.cpp
@@ -58,6 +58,7 @@ struct RedirEntry {
static RedirEntry kRedirMap[] = {
{ "epiphany", "file://" SHARE_DIR "/epiphany.html" },
{ "options", "http://epiphany.mozdev.org/about/options.html" },
+ { "marco", "http://mpgritti.oltrelinux.com" }
};
static const int kRedirTotal = sizeof(kRedirMap)/sizeof(*kRedirMap);
diff --git a/embed/mozilla/EphyAboutRedirector.h b/embed/mozilla/EphyAboutRedirector.h
index e135276c3..52d3dc76a 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_MARCO_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "marco"
#define EPHY_ABOUT_REDIRECTOR_CLASSNAME "Epiphany's about redirector"
nsresult NS_NewEphyAboutRedirectorFactory(nsIFactory** aFactory);
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index 8534738ec..11cba69b3 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -111,6 +111,13 @@ mozilla_register_components (void)
PR_TRUE);
if (NS_FAILED(rv)) ret = FALSE;
+ rv = RegisterFactory (NS_NewEphyAboutRedirectorFactory,
+ kEphyAboutRedirectorCID,
+ EPHY_ABOUT_REDIRECTOR_CLASSNAME,
+ EPHY_ABOUT_REDIRECTOR_MARCO_CONTRACTID,
+ PR_TRUE);
+ if (NS_FAILED(rv)) ret = FALSE;
+
rv = RegisterFactory (NS_NewFtpHandlerFactory, kFtpHandlerCID,
G_FTP_CONTENT_CLASSNAME, G_FTP_CONTENT_CONTRACTID,
PR_TRUE);
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp
index a7bc50a6c..0847f3473 100644
--- a/embed/mozilla/MozillaPrivate.cpp
+++ b/embed/mozilla/MozillaPrivate.cpp
@@ -56,6 +56,7 @@ NS_METHOD MozillaCollatePrintSettings (const EmbedPrintInfo *info,
switch (info->pages)
{
case 0:
+ options->SetPrintRange (nsIPrintSettings::kRangeAllPages);
break;
case 1:
options->SetPrintRange (nsIPrintSettings::kRangeSpecifiedPageRange);