aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2003-03-07 03:41:43 +0800
committerXan Lopez <xan@src.gnome.org>2003-03-07 03:41:43 +0800
commit789fcc6e7ce4840ecb294e0d00aa06f989bc974f (patch)
treeef3caa4ca14d229594d3298b4bb89257a28f4001
parent2d790e3b02e5f479571f618713f2fed3857cd2a2 (diff)
downloadgsoc2013-epiphany-789fcc6e7ce4840ecb294e0d00aa06f989bc974f.tar
gsoc2013-epiphany-789fcc6e7ce4840ecb294e0d00aa06f989bc974f.tar.gz
gsoc2013-epiphany-789fcc6e7ce4840ecb294e0d00aa06f989bc974f.tar.bz2
gsoc2013-epiphany-789fcc6e7ce4840ecb294e0d00aa06f989bc974f.tar.lz
gsoc2013-epiphany-789fcc6e7ce4840ecb294e0d00aa06f989bc974f.tar.xz
gsoc2013-epiphany-789fcc6e7ce4840ecb294e0d00aa06f989bc974f.tar.zst
gsoc2013-epiphany-789fcc6e7ce4840ecb294e0d00aa06f989bc974f.zip
about: world comination
about: world comination
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--data/Makefile.am6
-rw-r--r--data/conspiracy.xhtml49
-rw-r--r--data/epiphany.xhtml65
-rw-r--r--embed/mozilla/EphyAboutRedirector.cpp3
-rw-r--r--embed/mozilla/EphyAboutRedirector.h1
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp8
7 files changed, 141 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 925c5c4ff..02d675f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-03-06 Xan Lopez <xan@masilla.org>
+
+ * 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 <edd@usefulinc.com>
* 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<!--
+ World domination: Swede Overlords
+ XHTML: Xan López <xan@masilla.org>, based on about:mozilla
+ Swedish title translation: #swedesex on GimpNet
+ -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Alla hyllar våra svenska härskare</title>
+<style type="text/css">
+html {
+ background: white;
+ color: black;
+ font-weight: bolder;
+ font-size: xx-large;
+}
+
+#conspirancy {
+ margin-top: 15%;
+ font-size: 1.1em;
+ text-align: center;
+}
+
+#laughter {
+ color: white;
+ text-align: center;
+}
+
+span {
+ font-size: 1.3em;
+}
+</style>
+</head>
+<body>
+
+<div id="conspirancy">
+THERE IS NO SWEDE CONSPIRACY
+</div>
+
+<div id="laughter">
+*MWAHAHAHAHAHA*
+</div>
+
+</body>
+</html>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<!--
+ The contents of this file are subject to the Netscape Public License
+ Version 1.0 (the "NPL"); you may not use this file except in
+ compliance with the NPL. You may obtain a copy of the NPL at
+ http://www.mozilla.org/NPL/
+
+ Software distributed under the NPL is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ for the specific language governing rights and limitations under the
+ NPL.
+
+ The Initial Developer of this code under the NPL is Netscape
+ Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998 Netscape Communications Corporation. All Rights
+ Reserved.
+
+ Contributor(s):
+ Henrik Gemal <mozilla@gemal.dk>
+ Alexey Chernyak <alexeyc@bigfoot.com> (XHTML 1.1 conversion)
+ -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Epiphany</title>
+<style type="text/css">
+html {
+ background: #3399FF;
+ color: white;
+ font-style: italic;
+}
+
+#ephytext {
+ margin-top: 15%;
+ font-size: 1.1em;
+ text-align: center;
+}
+
+#from {
+ margin-top: 1em;
+ font-size: 1.5em;
+ text-align: right;
+}
+
+span {
+ font-size: 1.3em;
+}
+</style>
+</head>
+<body>
+
+<div id="ephytext">
+Perfection is achieved, not when there is nothing more to add,
+but when there is nothing left to take away.
+</div>
+
+<div id="from">
+Antoine de Saint-Exupery
+</div>
+
+</body>
+</html>
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 11:29:00 +0800