From 789fcc6e7ce4840ecb294e0d00aa06f989bc974f Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Thu, 6 Mar 2003 19:41:43 +0000 Subject: about: world comination about: world comination --- ChangeLog | 13 +++++++ data/Makefile.am | 6 +-- data/conspiracy.xhtml | 49 +++++++++++++++++++++++++ data/epiphany.xhtml | 65 +++++++++++++++++++++++++++++++++ embed/mozilla/EphyAboutRedirector.cpp | 3 +- embed/mozilla/EphyAboutRedirector.h | 1 + embed/mozilla/MozRegisterComponents.cpp | 8 ++++ 7 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 data/conspiracy.xhtml create mode 100644 data/epiphany.xhtml diff --git a/ChangeLog b/ChangeLog index 925c5c4ff..02d675f14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-03-06 Xan Lopez + + * data/Makefile.am: + * data/conspiracy.xhtml: + * data/epiphany.xhtml: + * embed/mozilla/EphyAboutRedirector.cpp: + * embed/mozilla/EphyAboutRedirector.h: + * embed/mozilla/MozRegisterComponents.cpp: + + about:epiphany, about:conspiracy (built-in until it's online + or we convince marco that it rocks). Please, suggest changes + to any of these if you don't like them. + 2003-03-06 Edd Dumbill * data/Makefile.am: diff --git a/data/Makefile.am b/data/Makefile.am index f53708b5d..d1df72dd6 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,8 +8,8 @@ server_in_files = GNOME_Epiphany_Automation.server.in GNOME_Epiphany_NautilusVie server_DATA = GNOME_Epiphany_Automation.server GNOME_Epiphany_NautilusView.server serverdir = $(libdir)/bonobo/servers -DESKTOP_IN_FILES=epiphany.desktop.in -DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop) +DESKTOP_IN_FILES= epiphany.desktop.in +DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in=.desktop) Applicationsdir = $(datadir)/applications Applications_DATA = $(DESKTOP_FILES) @@ -19,7 +19,7 @@ schema_in_files = epiphany.schemas.in schema_DATA = epiphany.schemas aboutdir = $(pkgdatadir) -about_DATA = epiphany.html +about_DATA = epiphany.xhtml conspiracy.xhtml install-data-local: if test -z "$(DESTDIR)" ; then \ diff --git a/data/conspiracy.xhtml b/data/conspiracy.xhtml new file mode 100644 index 000000000..103083836 --- /dev/null +++ b/data/conspiracy.xhtml @@ -0,0 +1,49 @@ + + + + + + + +Alla hyllar våra svenska härskare + + + + +
+THERE IS NO SWEDE CONSPIRACY +
+ +
+*MWAHAHAHAHAHA* +
+ + + diff --git a/data/epiphany.xhtml b/data/epiphany.xhtml new file mode 100644 index 000000000..bdba4933a --- /dev/null +++ b/data/epiphany.xhtml @@ -0,0 +1,65 @@ + + + + + + + +Epiphany + + + + +
+Perfection is achieved, not when there is nothing more to add, +but when there is nothing left to take away. +
+ +
+Antoine de Saint-Exupery +
+ + + 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); -- cgit v1.2.3