Version bump. Punt old
authorMart Raudsepp <leio@gentoo.org>
Thu, 8 Feb 2007 14:06:32 +0000 (14:06 +0000)
committerMart Raudsepp <leio@gentoo.org>
Thu, 8 Feb 2007 14:06:32 +0000 (14:06 +0000)
Package-Manager: portage-2.1.2-r9

www-client/epiphany/ChangeLog
www-client/epiphany/Manifest
www-client/epiphany/epiphany-2.16.3.ebuild [moved from www-client/epiphany/epiphany-2.16.1.ebuild with 78% similarity]
www-client/epiphany/files/digest-epiphany-2.16.1 [deleted file]
www-client/epiphany/files/digest-epiphany-2.16.3 [new file with mode: 0644]
www-client/epiphany/files/epiphany-2.16.1-dbus-1.patch [deleted file]
www-client/epiphany/files/epiphany-2.16.1-firefox2.patch [deleted file]

index 336999a745dfbf188319829c03678c24f2c56076..518725cc470bf69a82e94bfa454c807d36c20f37 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.102 2007/02/04 08:58:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.103 2007/02/08 14:06:32 leio Exp $
+
+*epiphany-2.16.3 (08 Feb 2007)
+
+  08 Feb 2007; Mart Raudsepp <leio@gentoo.org>
+  -files/epiphany-2.16.1-dbus-1.patch,
+  -files/epiphany-2.16.1-firefox2.patch, -epiphany-2.16.1.ebuild,
+  +epiphany-2.16.3.ebuild:
+  Version bump. Punt old
 
   04 Feb 2007; Markus Rothe <corsair@gentoo.org> epiphany-2.16.2.ebuild:
   Stable on ppc64; bug #164978
index 7d8c68288cb1f8f688f39ee1a2bf6ed98e451096..14da9c14e831650c5a0489c3573b376e3fbab4e7 100644 (file)
@@ -1,19 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX epiphany-1.9.2-broken-firefox.patch 563 RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 SHA1 1628d707e8aff03dd3992f9db30e2189ff7e2197 SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e
 MD5 9bff9c987534a9f2cbefa291a28affe7 files/epiphany-1.9.2-broken-firefox.patch 563
 RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 files/epiphany-1.9.2-broken-firefox.patch 563
 SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e files/epiphany-1.9.2-broken-firefox.patch 563
-AUX epiphany-2.16.1-dbus-1.patch 1207 RMD160 9fa47b2fbd77442cd54379c35a75c1e4db269d4e SHA1 8f16f4c808f5cc53afab97467ee624d482b16608 SHA256 2da6eedfd9a0869d7fab414e38e9d8a83bc71d231c98503183bd8edd3c28e453
-MD5 3e8e9c43a466150fae9ec703661d58ed files/epiphany-2.16.1-dbus-1.patch 1207
-RMD160 9fa47b2fbd77442cd54379c35a75c1e4db269d4e files/epiphany-2.16.1-dbus-1.patch 1207
-SHA256 2da6eedfd9a0869d7fab414e38e9d8a83bc71d231c98503183bd8edd3c28e453 files/epiphany-2.16.1-dbus-1.patch 1207
-AUX epiphany-2.16.1-firefox2.patch 10503 RMD160 b8b68c38054e52b1e050d0ab8c274abf31514a9b SHA1 a9921828405851c7bf78882977ceece0ab2b27a3 SHA256 11dc156918c0e31d5fad835a69d894aaedadc8bc777b30295466d0ab3ceaa616
-MD5 c78b5d28c6b07896ca56dcae5bd2b252 files/epiphany-2.16.1-firefox2.patch 10503
-RMD160 b8b68c38054e52b1e050d0ab8c274abf31514a9b files/epiphany-2.16.1-firefox2.patch 10503
-SHA256 11dc156918c0e31d5fad835a69d894aaedadc8bc777b30295466d0ab3ceaa616 files/epiphany-2.16.1-firefox2.patch 10503
 DIST epiphany-2.14.2.1.tar.bz2 3599395 RMD160 c25bc2d22fee0eeaa32ce1e1f71b6d5f3de06cbb SHA1 c1b20979670755f2e82beedb475c42a54be8f993 SHA256 f5cc3aa382fb9b0eec4117dcbfb5a7744943602d1a76bf260c7e5c66741ee6d0
 DIST epiphany-2.14.3.tar.bz2 3626121 RMD160 877717318c367fc1f9c9a7f69058179265082d2b SHA1 6be1f3ac4864e75543d114b4705188d65af5f3d4 SHA256 1acc18428a14806a767f4a10c51d235483dc48b8f42f75c4afe95487f7cf36a0
-DIST epiphany-2.16.1.tar.bz2 3761594 RMD160 dd4fe05f8ca019a5ba83788ca5d73c169e247cce SHA1 0610dfb98e44c5f958aff9b8db896b9efbf29817 SHA256 edc36ae24624cae00aa06dde6475c31574d5fc281612dfd1e51cda63c7a9300a
 DIST epiphany-2.16.2.tar.bz2 4229155 RMD160 f9c65ccae1328ae3f0032950dff409a4eb6ad299 SHA1 ddd8d0768fa32f3642f87ba6639c1d9b1405c116 SHA256 3b0ce7104ef9f2b9c22998aa28e715d48c76c3333f573472fbbabb1ed7ad13c6
+DIST epiphany-2.16.3.tar.bz2 4232106 RMD160 1eb60d36af50cc4d56cfeaf3c9772f033e9e1e3f SHA1 f2a1a3cf9b5d1629304812371efc87041e6a089e SHA256 a1a328d65dc95bd30d79b6434ae25db760f0d383baa9f25bb6862177e4d6f12d
 EBUILD epiphany-2.14.2.1-r1.ebuild 2842 RMD160 69f4fcdf43f970c3572f1eda65929e9338cb7f07 SHA1 442919d81acb7c9055db1b2e30bff8f798b872f5 SHA256 927958b3ecb665e7eb3e780202cc25c58dc17c8e6b07126129990f8b00e138b7
 MD5 bf6ab4142d6d873fd8a92290563a8e9c epiphany-2.14.2.1-r1.ebuild 2842
 RMD160 69f4fcdf43f970c3572f1eda65929e9338cb7f07 epiphany-2.14.2.1-r1.ebuild 2842
@@ -22,18 +17,18 @@ EBUILD epiphany-2.14.3.ebuild 2879 RMD160 bc94da5c008ee628d09ae19294b6710099b7c5
 MD5 5af60ea924a4530e996fea42733a8ab6 epiphany-2.14.3.ebuild 2879
 RMD160 bc94da5c008ee628d09ae19294b6710099b7c53f epiphany-2.14.3.ebuild 2879
 SHA256 41252adc2312b9ba2fbeb763fa91e9779229ef111daf5128b6201d556d6fa931 epiphany-2.14.3.ebuild 2879
-EBUILD epiphany-2.16.1.ebuild 2251 RMD160 8f32c9f40e1689b4b64052379da3a75be413e1a5 SHA1 320b735e6008696f22ec04ad4ee2cc23dd855687 SHA256 35f61da7b26881dff3e751883c43e6c3ed9b97d4a71701cea4ece15c01fd3a1e
-MD5 58d027bf2a49bb2fc445c34342054cd0 epiphany-2.16.1.ebuild 2251
-RMD160 8f32c9f40e1689b4b64052379da3a75be413e1a5 epiphany-2.16.1.ebuild 2251
-SHA256 35f61da7b26881dff3e751883c43e6c3ed9b97d4a71701cea4ece15c01fd3a1e epiphany-2.16.1.ebuild 2251
 EBUILD epiphany-2.16.2.ebuild 2061 RMD160 2fb3da421b3121cf7c970c080062b40214a60952 SHA1 f210db43e6975f5c86890d39a97cd3fee2d8b54e SHA256 c289cccbd25132efe74f81106df7b16a08ffb35fc86f5e748fac641a32d6e502
 MD5 24928719a585ffd4c7ca5b4427eff7e6 epiphany-2.16.2.ebuild 2061
 RMD160 2fb3da421b3121cf7c970c080062b40214a60952 epiphany-2.16.2.ebuild 2061
 SHA256 c289cccbd25132efe74f81106df7b16a08ffb35fc86f5e748fac641a32d6e502 epiphany-2.16.2.ebuild 2061
-MISC ChangeLog 26475 RMD160 40273c3b8b0fe100fc05e7b7ef685a7e73fb86e0 SHA1 51050270e0bef8e57ed41201f0efe4ff2a9475a2 SHA256 badfa77a3b51de16dafc4ac50c3389a156a4b4d4a8306e8dc25b4e82eabc4605
-MD5 54038b461c3c54185ec9e8a1dc39b510 ChangeLog 26475
-RMD160 40273c3b8b0fe100fc05e7b7ef685a7e73fb86e0 ChangeLog 26475
-SHA256 badfa77a3b51de16dafc4ac50c3389a156a4b4d4a8306e8dc25b4e82eabc4605 ChangeLog 26475
+EBUILD epiphany-2.16.3.ebuild 1920 RMD160 4b4464d504cd10c2d2298f03f184d5d8d715c7c4 SHA1 0b7fa78374f28686a097cdba0c9b24e3e6d66fbd SHA256 6b48c0dd46efb6a06b68a676451da1aa58f7b71bf5d0320685a9aa610143f422
+MD5 f69f61442852500021ec288f46068858 epiphany-2.16.3.ebuild 1920
+RMD160 4b4464d504cd10c2d2298f03f184d5d8d715c7c4 epiphany-2.16.3.ebuild 1920
+SHA256 6b48c0dd46efb6a06b68a676451da1aa58f7b71bf5d0320685a9aa610143f422 epiphany-2.16.3.ebuild 1920
+MISC ChangeLog 26709 RMD160 d7bca0f53031180adba132247a5bf161a84951e8 SHA1 a763cef7b38c93d871f7a5495a0ca952eb8da0b7 SHA256 f216b238c7ef327d84aeacbcd9789ba22e7ea1be6f568abe01f1474de2d021d6
+MD5 374b87d1da91d829ca95d66fc69b594c ChangeLog 26709
+RMD160 d7bca0f53031180adba132247a5bf161a84951e8 ChangeLog 26709
+SHA256 f216b238c7ef327d84aeacbcd9789ba22e7ea1be6f568abe01f1474de2d021d6 ChangeLog 26709
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -44,9 +39,16 @@ SHA256 ae3d6849d636421f6c7694df3e227277d6badaf54579154868b78ea559c9fb19 files/di
 MD5 90100c69d67f07d05c5d1a30796eefa7 files/digest-epiphany-2.14.3 253
 RMD160 0849aa2144d59338bcdb1bf14f6379bd09f8d126 files/digest-epiphany-2.14.3 253
 SHA256 f6c50e38d4c78fcac7502a9a0b8386d587fbd70c03e4f17e5cf385971e5e444f files/digest-epiphany-2.14.3 253
-MD5 dd439a49d73c308804518dfea2da617c files/digest-epiphany-2.16.1 253
-RMD160 53de0fa736b907a37cabec8b474ca94c23e794a4 files/digest-epiphany-2.16.1 253
-SHA256 4ae08901d8f0039174bfdaefffde4ae810cea81aa0c9b06d3ed60ec6ccdb8c03 files/digest-epiphany-2.16.1 253
 MD5 06b90cbced0005f292a7188a8a04fb52 files/digest-epiphany-2.16.2 253
 RMD160 932a932c5fcc8fe150c80780b798f4c1b2ce212d files/digest-epiphany-2.16.2 253
 SHA256 ec51c9963d69526e32f14e6154c460d1f075654ae673d82a7a676bade4539cc2 files/digest-epiphany-2.16.2 253
+MD5 c206f566c2a9fee7a2bf0b2cd4999f4f files/digest-epiphany-2.16.3 253
+RMD160 b236b9d1cd08f8e516405ca4555955a7fc760d88 files/digest-epiphany-2.16.3 253
+SHA256 0b4501d2f4b19941be75a9dc9ec4b771b0278717b9b17435b622cc18ffc93c30 files/digest-epiphany-2.16.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFyy5WkeYb6olFHJcRAv4yAKDR2Fq5X77YkDMPbfscRrv7Cn125wCeOnWh
+AFbw5D6zWyPfY+kKFj8ngEs=
+=sXG1
+-----END PGP SIGNATURE-----
similarity index 78%
rename from www-client/epiphany/epiphany-2.16.1.ebuild
rename to www-client/epiphany/epiphany-2.16.3.ebuild
index 6f92a4437e16782a985a2cae6e7f6de9537639da..28d74a387acb8642e0fcb34715359b6def56a8ff 100644 (file)
@@ -1,18 +1,15 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.16.1.ebuild,v 1.4 2007/01/28 03:50:58 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.16.3.ebuild,v 1.1 2007/02/08 14:06:32 leio Exp $
 
-WANT_AUTOMAKE=1.9
-WANT_AUTOCONF=2.5
-
-inherit eutils gnome2 multilib autotools
+inherit eutils gnome2 multilib
 
 DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
 HOMEPAGE="http://www.gnome.org/projects/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc python"
 
 RDEPEND=">=dev-libs/glib-2.12
@@ -58,14 +55,6 @@ src_unpack() {
        gnome2_src_unpack
 
        epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
-       # Fix search from URL bar with FF2.  Requres a rebuild. bug #153902
-       epatch ${FILESDIR}/${P}-firefox2.patch
-       # Allow to build with dbus 1.0.  Bug #155380
-       epatch ${FILESDIR}/${P}-dbus-1.patch
-
-       cp aclocal.m4 old_macros.m4
-       AT_M4DIR=". ${S}/m4" \
-       eautoreconf || die "Failed to reconfigure"
 }
 
 src_compile() {
diff --git a/www-client/epiphany/files/digest-epiphany-2.16.1 b/www-client/epiphany/files/digest-epiphany-2.16.1
deleted file mode 100644 (file)
index 0d91ef7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 25fecb147b1c68cc71d2af2bac727724 epiphany-2.16.1.tar.bz2 3761594
-RMD160 dd4fe05f8ca019a5ba83788ca5d73c169e247cce epiphany-2.16.1.tar.bz2 3761594
-SHA256 edc36ae24624cae00aa06dde6475c31574d5fc281612dfd1e51cda63c7a9300a epiphany-2.16.1.tar.bz2 3761594
diff --git a/www-client/epiphany/files/digest-epiphany-2.16.3 b/www-client/epiphany/files/digest-epiphany-2.16.3
new file mode 100644 (file)
index 0000000..7799903
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 3ee93d168eb5720a96f4c7adf2cdf2d4 epiphany-2.16.3.tar.bz2 4232106
+RMD160 1eb60d36af50cc4d56cfeaf3c9772f033e9e1e3f epiphany-2.16.3.tar.bz2 4232106
+SHA256 a1a328d65dc95bd30d79b6434ae25db760f0d383baa9f25bb6862177e4d6f12d epiphany-2.16.3.tar.bz2 4232106
diff --git a/www-client/epiphany/files/epiphany-2.16.1-dbus-1.patch b/www-client/epiphany/files/epiphany-2.16.1-dbus-1.patch
deleted file mode 100644 (file)
index b8eb5f8..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/src/ephy-dbus.c epiphany-2.16.1/src/ephy-dbus.c
---- epiphany-2.16.1.orig/src/ephy-dbus.c       2006-09-13 07:48:50.000000000 -0400
-+++ epiphany-2.16.1/src/ephy-dbus.c    2006-11-17 11:20:53.000000000 -0500
-@@ -301,16 +301,6 @@ ephy_dbus_connect_to_session_bus (EphyDb
-       return TRUE;
- }
- 
--static void
--ephy_dbus_disconnect_bus (DBusGConnection *bus)
--{
--      if (bus != NULL) {
--              dbus_connection_close
--                      (dbus_g_connection_get_connection (bus));
--              dbus_g_connection_unref (bus);
--      }
--}
--
- /* Public methods */
- 
- static void
-@@ -337,7 +327,7 @@ ephy_dbus_shutdown (EphyDbus *dbus)
-               dbus_connection_remove_filter
-                       (dbus_g_connection_get_connection (priv->session_bus),
-                        session_filter_func, dbus);
--              ephy_dbus_disconnect_bus (priv->session_bus);
-+              dbus_g_connection_unref (priv->session_bus);
-               priv->session_bus = NULL;
-       }
- 
-@@ -346,7 +336,7 @@ ephy_dbus_shutdown (EphyDbus *dbus)
-               dbus_connection_remove_filter
-                       (dbus_g_connection_get_connection (priv->system_bus),
-                        system_filter_func, dbus);
--              ephy_dbus_disconnect_bus (priv->system_bus);
-+              dbus_g_connection_unref (priv->system_bus);
-               priv->system_bus = NULL;
-       }
- }
diff --git a/www-client/epiphany/files/epiphany-2.16.1-firefox2.patch b/www-client/epiphany/files/epiphany-2.16.1-firefox2.patch
deleted file mode 100644 (file)
index 9dbf6fc..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/embed/ephy-embed.c epiphany-2.16.1/embed/ephy-embed.c
---- epiphany-2.16.1.orig/embed/ephy-embed.c    2006-09-13 07:48:29.000000000 -0400
-+++ epiphany-2.16.1/embed/ephy-embed.c 2006-11-17 11:17:32.000000000 -0500
-@@ -423,6 +423,25 @@ ephy_embed_load_url (EphyEmbed *embed,
- }
- 
- /**
-+ * ephy_embed_load:
-+ * @embed: an #EphyEmbed
-+ * @url: an URL
-+ * @flags: flags modifying load behaviour
-+ * @previous_embed: the referrer embed or %NULL
-+ *
-+ * Loads a new web page in @embed.
-+ **/
-+void
-+ephy_embed_load (EphyEmbed *embed,
-+               const char *url,
-+               EphyEmbedLoadFlags flags,
-+               EphyEmbed *referring_embed)
-+{
-+      EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed);
-+      iface->load (embed, url, flags, referring_embed);
-+}
-+
-+/**
-  * ephy_embed_stop_load:
-  * @embed: an #EphyEmbed
-  *
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/embed/ephy-embed.h epiphany-2.16.1/embed/ephy-embed.h
---- epiphany-2.16.1.orig/embed/ephy-embed.h    2006-09-13 07:48:29.000000000 -0400
-+++ epiphany-2.16.1/embed/ephy-embed.h 2006-11-17 11:17:32.000000000 -0500
-@@ -63,6 +63,12 @@ typedef enum
-       EPHY_EMBED_CHROME_BOOKMARKSBAR  = 1 << 3
- } EphyEmbedChrome;
- 
-+typedef enum
-+{
-+      EPHY_EMBED_LOAD_FLAGS_NONE                      = 1 << 0,
-+      EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP   = 1 << 1,
-+} EphyEmbedLoadFlags;
-+
- #define EPHY_EMBED_CHROME_ALL (EPHY_EMBED_CHROME_MENUBAR |    \
-                              EPHY_EMBED_CHROME_TOOLBAR |      \
-                              EPHY_EMBED_CHROME_STATUSBAR |    \
-@@ -157,6 +163,10 @@ struct _EphyEmbedIface
-       /* Methods  */
-       void               (* load_url)                 (EphyEmbed *embed,
-                                                        const char *url);
-+      void               (* load)                     (EphyEmbed *embed,
-+                                                       const char *url,
-+                                                       EphyEmbedLoadFlags flags,
-+                                                       EphyEmbed *referring_embed);
-       void               (* stop_load)                (EphyEmbed *embed);
-       void               (* reload)                   (EphyEmbed *embed,
-                                                        gboolean force);
-@@ -232,6 +242,10 @@ GType               ephy_embed_get_type                   (void);
- /* Base */
- void            ephy_embed_load_url                   (EphyEmbed *embed,
-                                                        const char *url);
-+void            ephy_embed_load                       (EphyEmbed *embed,
-+                                                       const char *url,
-+                                                       EphyEmbedLoadFlags flags,
-+                                                       EphyEmbed *referring_embed);
- 
- void            ephy_embed_stop_load                  (EphyEmbed *embed);
- 
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/embed/mozilla/EphyBrowser.cpp epiphany-2.16.1/embed/mozilla/EphyBrowser.cpp
---- epiphany-2.16.1.orig/embed/mozilla/EphyBrowser.cpp 2006-09-13 07:48:34.000000000 -0400
-+++ epiphany-2.16.1/embed/mozilla/EphyBrowser.cpp      2006-11-17 11:17:32.000000000 -0500
-@@ -1524,3 +1524,55 @@ EphyBrowser::Close ()
- 
-       return domWin->Close();
- }
-+
-+nsresult
-+EphyBrowser::GetPIDOMWindow(nsPIDOMWindow **aPIWin)
-+{
-+  *aPIWin = nsnull;
-+
-+  // get the private DOM window
-+  nsCOMPtr<nsPIDOMWindow> domWindowPrivate = do_QueryInterface(mDOMWindow);
-+
-+  // and the root window for that DOM window
-+  *aPIWin = domWindowPrivate->GetPrivateRoot();
-+
-+  if (*aPIWin) 
-+  {
-+    NS_ADDREF(*aPIWin);
-+    return NS_OK;
-+  }
-+
-+  return NS_ERROR_FAILURE;
-+
-+}
-+
-+nsresult
-+EphyBrowser::LoadURI(const char *aURI,
-+                   PRUint32 aLoadFlags,
-+                   nsIURI *aReferrer)
-+{
-+      nsString uURI;
-+      nsresult rv = NS_OK;
-+
-+      NS_CStringToUTF16 (nsCString (aURI), NS_CSTRING_ENCODING_UTF8, uURI);
-+
-+      if (uURI.Length() == 0) return NS_OK;
-+ 
-+      nsCOMPtr<nsIWebNavigation> contentNav = do_QueryInterface (mWebBrowser);
-+      NS_ENSURE_TRUE (contentNav, NS_ERROR_FAILURE);
-+
-+      nsCOMPtr<nsPIDOMWindow> piWin;
-+      rv = GetPIDOMWindow(getter_AddRefs(piWin));
-+      NS_ENSURE_SUCCESS (rv, rv);
-+
-+      nsAutoPopupStatePusher popupStatePusher(piWin, openAllowed);
-+
-+      rv = contentNav->LoadURI(uURI.get(),   // URI string
-+                               aLoadFlags,   // Load flags
-+                               aReferrer,    // Referring URI
-+                               nsnull,       // Post data
-+                               nsnull);      // extra headers
-+
-+      return rv;
-+}
-+
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/embed/mozilla/EphyBrowser.h epiphany-2.16.1/embed/mozilla/EphyBrowser.h
---- epiphany-2.16.1.orig/embed/mozilla/EphyBrowser.h   2006-09-13 07:48:35.000000000 -0400
-+++ epiphany-2.16.1/embed/mozilla/EphyBrowser.h        2006-11-17 11:17:32.000000000 -0500
-@@ -36,6 +36,7 @@
- #include <nsIWebBrowserFocus.h>
- #include <nsIWebBrowser.h>
- #include <nsIWebNavigation.h>
-+#include <nsPIDOMWindow.h>
- 
- #ifdef ALLOW_PRIVATE_API
- #include <nsIContentViewer.h>
-@@ -172,6 +173,7 @@ public:
-       nsresult GetDocumentURI (nsIURI **aURI);
-       nsresult GetTargetDocumentURI (nsIURI **aURI);
-       nsresult GetDOMWindow (nsIDOMWindow **window);
-+      nsresult GetPIDOMWindow(nsPIDOMWindow **aPIWin);
- 
-       nsresult GetHasModifiedForms (PRBool *modified);
- 
-@@ -183,6 +185,10 @@ public:
- 
-       nsresult Close ();
- 
-+      nsresult LoadURI(const char *aURI, 
-+                       PRUint32 aLoadFlags = nsIWebNavigation::LOAD_FLAGS_NONE, 
-+                       nsIURI *aURI = nsnull);
-+
-         EphyEmbedDocumentType GetDocumentType ();
- 
-       nsCOMPtr<nsIWebBrowser> mWebBrowser;
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/embed/mozilla/mozilla-embed.cpp epiphany-2.16.1/embed/mozilla/mozilla-embed.cpp
---- epiphany-2.16.1.orig/embed/mozilla/mozilla-embed.cpp       2006-09-13 07:48:39.000000000 -0400
-+++ epiphany-2.16.1/embed/mozilla/mozilla-embed.cpp    2006-11-17 11:18:04.000000000 -0500
-@@ -324,6 +324,42 @@ impl_load_url (EphyEmbed *embed, 
-         gtk_moz_embed_load_url (GTK_MOZ_EMBED(embed), url);
- }
- 
-+static char * impl_get_location (EphyEmbed *embed, gboolean toplevel);
-+
-+static void
-+impl_load (EphyEmbed *embed, 
-+           const char *url,
-+         EphyEmbedLoadFlags flags,
-+         EphyEmbed *preview_embed)
-+{
-+      EphyBrowser *browser;
-+
-+      browser = MOZILLA_EMBED(embed)->priv->browser;
-+      g_return_if_fail (browser != NULL);
-+
-+      nsCOMPtr<nsIURI> uri;
-+      if (preview_embed != NULL)
-+      {
-+              EphyBrowser *pbrowser;
-+
-+              pbrowser = MOZILLA_EMBED(preview_embed)->priv->browser;
-+              if (pbrowser != NULL)
-+              {
-+                      pbrowser->GetDocumentURI (getter_AddRefs (uri));
-+              }
-+      }
-+#ifdef HAVE_GECKO_1_8_1
-+      if (flags & EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP)
-+      {
-+              browser->LoadURI (url, nsIWebNavigation::LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP, uri);      
-+      }
-+      else
-+#endif /* HAVE_GECKO_1_8_1 */
-+      {
-+              browser->LoadURI (url, nsIWebNavigation::LOAD_FLAGS_NONE, uri); 
-+      }
-+}
-+
- static void
- impl_stop_load (EphyEmbed *embed)
- {
-@@ -1114,6 +1150,7 @@ static void
- ephy_embed_iface_init (EphyEmbedIface *iface)
- {
-       iface->load_url = impl_load_url; 
-+      iface->load = impl_load; 
-       iface->stop_load = impl_stop_load;
-       iface->can_go_back = impl_can_go_back;
-       iface->can_go_forward =impl_can_go_forward;
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/src/ephy-link.h epiphany-2.16.1/src/ephy-link.h
---- epiphany-2.16.1.orig/src/ephy-link.h       2006-09-13 07:48:52.000000000 -0400
-+++ epiphany-2.16.1/src/ephy-link.h    2006-11-17 11:17:32.000000000 -0500
-@@ -41,7 +41,8 @@ typedef enum\r
- {\r
-       EPHY_LINK_NEW_WINDOW    = 1 << 0,\r
-       EPHY_LINK_NEW_TAB       = 1 << 1,\r
--      EPHY_LINK_JUMP_TO       = 1 << 2\r
-+      EPHY_LINK_JUMP_TO       = 1 << 2,\r
-+      EPHY_LINK_ALLOW_FIXUP   = 1 << 3\r
- } EphyLinkFlags;\r
- \r
- struct _EphyLinkIface\r
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/src/ephy-location-action.c epiphany-2.16.1/src/ephy-location-action.c
---- epiphany-2.16.1.orig/src/ephy-location-action.c    2006-09-13 07:48:52.000000000 -0400
-+++ epiphany-2.16.1/src/ephy-location-action.c 2006-11-17 11:17:32.000000000 -0500
-@@ -139,7 +139,7 @@ action_activated_cb (GtkEntryCompletion 
-               if (url == NULL) return;
- 
-               ephy_link_open (EPHY_LINK (action), url, NULL,
--                              ephy_link_flags_from_current_event ());
-+                              ephy_link_flags_from_current_event () | EPHY_LINK_ALLOW_FIXUP);
- 
-               g_free (url);
-       }
-@@ -162,7 +162,7 @@ entry_activate_cb (GtkEntry *entry,
-       g_return_if_fail (address != NULL);
- 
-       ephy_link_open (EPHY_LINK (action), address, NULL, 
--                      ephy_link_flags_from_current_event ());
-+                      ephy_link_flags_from_current_event () | EPHY_LINK_ALLOW_FIXUP);
- 
-       g_free (address);
- }
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/src/ephy-shell.c epiphany-2.16.1/src/ephy-shell.c
---- epiphany-2.16.1.orig/src/ephy-shell.c      2006-09-13 07:48:52.000000000 -0400
-+++ epiphany-2.16.1/src/ephy-shell.c   2006-11-17 11:17:32.000000000 -0500
-@@ -530,8 +530,20 @@ ephy_shell_new_tab_full (EphyShell *shel
-       }
-       else if (flags & EPHY_NEW_TAB_OPEN_PAGE)
-       {
-+              EphyEmbedLoadFlags load_flags = 0;
-+
-               g_assert (url != NULL);
--              ephy_embed_load_url (embed, url);
-+
-+              if (flags & EPHY_NEW_TAB_ALLOW_FIXUP)
-+              {
-+                      load_flags = EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
-+              }
-+              else
-+              {
-+                      load_flags = EPHY_EMBED_LOAD_FLAGS_NONE;
-+              }
-+              ephy_embed_load (embed, url, load_flags, previous_embed);
-+
-               is_empty = url_is_empty (url);
-       }
- 
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/src/ephy-shell.h epiphany-2.16.1/src/ephy-shell.h
---- epiphany-2.16.1.orig/src/ephy-shell.h      2006-09-13 07:48:53.000000000 -0400
-+++ epiphany-2.16.1/src/ephy-shell.h   2006-11-17 11:17:32.000000000 -0500
-@@ -62,6 +62,10 @@ typedef enum
-       EPHY_NEW_TAB_JUMP               = 1 << 9,
-       EPHY_NEW_TAB_IN_NEW_WINDOW      = 1 << 10,
-       EPHY_NEW_TAB_IN_EXISTING_WINDOW = 1 << 11,
-+
-+      /* The way to load */
-+      EPHY_NEW_TAB_ALLOW_FIXUP        = 1 << 12,
-+      
- } EphyNewTabFlags;
- 
- struct _EphyShell
-diff --exclude-from=/home/dang/.diffrc -up -ruN epiphany-2.16.1.orig/src/ephy-window.c epiphany-2.16.1/src/ephy-window.c
---- epiphany-2.16.1.orig/src/ephy-window.c     2006-09-13 07:48:53.000000000 -0400
-+++ epiphany-2.16.1/src/ephy-window.c  2006-11-17 11:17:32.000000000 -0500
-@@ -2976,7 +2976,9 @@ ephy_window_open_link (EphyLink *link,
-               tab = ephy_window_get_active_tab (window);
-       }
- 
--      if (flags != 0)
-+      if (flags  & (EPHY_LINK_JUMP_TO | 
-+                    EPHY_LINK_NEW_TAB | 
-+                    EPHY_LINK_NEW_WINDOW))
-       {
-               EphyNewTabFlags ntflags = EPHY_NEW_TAB_OPEN_PAGE;
- 
-@@ -2993,6 +2995,10 @@ ephy_window_open_link (EphyLink *link,
-               {
-                       ntflags |= EPHY_NEW_TAB_IN_EXISTING_WINDOW;
-               }
-+              if (flags & EPHY_LINK_ALLOW_FIXUP)
-+              {
-+                      ntflags |= EPHY_NEW_TAB_ALLOW_FIXUP;
-+              }
- 
-               new_tab = ephy_shell_new_tab
-                               (ephy_shell,
-@@ -3005,7 +3011,17 @@ ephy_window_open_link (EphyLink *link,
-               
-               embed = ephy_tab_get_embed (tab);
- 
-+              if (flags & EPHY_LINK_ALLOW_FIXUP)
-+              {
-+                      ephy_embed_load (embed, 
-+                                       address, 
-+                                       EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP,
-+                                       NULL);
-+              }
-+              else
-+              {
-               ephy_embed_load_url (embed, address);
-+              }
- 
-               if (address == NULL || address[0] == '\0' || strcmp (address, "about:blank") == 0)
-               {