summaryrefslogtreecommitdiffstats
path: root/www/epiphany/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/epiphany/files')
-rw-r--r--www/epiphany/files/patch-configure10
-rw-r--r--www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp29
-rw-r--r--www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp94
-rw-r--r--www/epiphany/files/patch-embed_mozilla_EventContext.cpp40
-rw-r--r--www/epiphany/files/patch-src_ephy-nautilus-view.c51
5 files changed, 0 insertions, 224 deletions
diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure
deleted file mode 100644
index 0f5ae010c..000000000
--- a/www/epiphany/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Tue Jul 15 14:31:11 2003
-+++ configure Tue Jul 15 14:31:11 2003
-@@ -18205,6 +18205,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp b/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp
deleted file mode 100644
index 48f6e973a..000000000
--- a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- embed/mozilla/EphyEventListener.cpp.orig Sat Nov 1 22:39:59 2003
-+++ embed/mozilla/EphyEventListener.cpp Sat Nov 1 22:41:44 2003
-@@ -16,6 +16,10 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <nsCOMPtr.h>
-
- #include "EphyEventListener.h"
-@@ -80,9 +84,15 @@
- nsCOMPtr<nsIDocument> doc = do_QueryInterface (domDoc);
- if(!doc) return NS_ERROR_FAILURE;
-
-+#if MOZILLA_SNAPSHOT > 11
-+ nsIURI *uri;
-+ uri = doc->GetDocumentURL ();
-+ if (uri == NULL) return NS_ERROR_FAILURE;
-+#else
- nsCOMPtr<nsIURI> uri;
- result = doc->GetDocumentURL(getter_AddRefs(uri));
- if (NS_FAILED (result)) return NS_ERROR_FAILURE;
-+#endif
-
- const nsACString &link = NS_ConvertUCS2toUTF8(value);
- nsCAutoString favicon_url;
diff --git a/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp b/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp
deleted file mode 100644
index a1d510768..000000000
--- a/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
---- embed/mozilla/EphyWrapper.cpp.orig Fri Oct 17 18:57:27 2003
-+++ embed/mozilla/EphyWrapper.cpp Sun Nov 30 18:57:18 2003
-@@ -74,6 +74,7 @@
- #include "nsIPresContext.h"
- #include "nsIAtom.h"
- #include "nsIDocumentCharsetInfo.h"
-+#include "nsPromiseFlatString.h"
- #include "ContentHandler.h"
- #include "EphyEventListener.h"
-
-@@ -590,8 +591,13 @@
- nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
- if(!doc) return NS_ERROR_FAILURE;
-
-+#if MOZILLA_SNAPSHOT > 11
-+ nsIURI *uri;
-+ uri = doc->GetDocumentURL ();
-+#else
- nsCOMPtr<nsIURI> uri;
- doc->GetDocumentURL(getter_AddRefs(uri));
-+#endif
-
- return uri->GetSpec (url);
- }
-@@ -608,8 +614,13 @@
- nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
- if(!doc) return NS_ERROR_FAILURE;
-
-+#if MOZILLA_SNAPSHOT > 11
-+ nsIURI *uri;
-+ uri = doc->GetDocumentURL ();
-+#else
- nsCOMPtr<nsIURI> uri;
- doc->GetDocumentURL(getter_AddRefs(uri));
-+#endif
-
- uri->GetSpec (url);
-
-@@ -773,23 +784,13 @@
- info = g_new0 (EphyEncodingInfo, 1);
- *infoptr = info;
-
--#if MOZILLA_SNAPSHOT >= 10
-- nsCAutoString enc;
-- result = doc->GetDocumentCharacterSet (enc);
-- if (NS_FAILED (result)) return NS_ERROR_FAILURE;
--
-- info->encoding = g_strdup (enc.get());
--#else
-- nsAutoString enc;
-- result = doc->GetDocumentCharacterSet (enc);
-- if (NS_FAILED (result)) return NS_ERROR_FAILURE;
--
-- info->encoding = g_strdup (NS_ConvertUCS2toUTF8(enc).get());
--#endif
--
- PRInt32 source;
-+#if MOZILLA_SNAPSHOT > 11
-+ source = doc->GetDocumentCharacterSetSource ();
-+#else
- result = doc->GetDocumentCharacterSetSource (&source);
- if (NS_FAILED (result)) return NS_ERROR_FAILURE;
-+#endif
- info->encoding_source = (EphyEncodingSource) source;
-
- nsCOMPtr<nsIDocShell> ds;
-@@ -831,7 +832,27 @@
- &result);
- if (NS_FAILED(result) || !mdv) return NS_ERROR_FAILURE;
-
-+#if MOZILLA_SNAPSHOT > 11
-+ const nsACString& charsetEnc = doc->GetDocumentCharacterSet ();
-+ if (charsetEnc.IsEmpty()) return NS_ERROR_FAILURE;
-+
-+ info->encoding = g_strdup (PromiseFlatCString(charsetEnc).get());
-+#elif MOZILLA_SNAPSHOT >= 10
-+ nsCAutoString charsetEnc;
-+ result = doc->GetDocumentCharacterSet (charsetEnc);
-+ if (NS_FAILED (result)) return NS_ERROR_FAILURE;
-+
-+ info->encoding = g_strdup (charsetEnc.get());
-+#else
-+ nsAutoString charsetEnc;
-+ result = doc->GetDocumentCharacterSet (charsetEnc);
-+ if (NS_FAILED (result)) return NS_ERROR_FAILURE;
-+
-+ info->encoding = g_strdup (NS_ConvertUCS2toUTF8(charsetEnc).get());
-+#endif
-+
- #if MOZILLA_SNAPSHOT >= 10
-+ nsCAutoString enc;
- result = mdv->GetDefaultCharacterSet (enc);
- if (NS_FAILED (result)) return NS_ERROR_FAILURE;
- info->default_encoding = g_strdup (enc.get());
diff --git a/www/epiphany/files/patch-embed_mozilla_EventContext.cpp b/www/epiphany/files/patch-embed_mozilla_EventContext.cpp
deleted file mode 100644
index f40825763..000000000
--- a/www/epiphany/files/patch-embed_mozilla_EventContext.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- embed/mozilla/EventContext.cpp.orig Thu Oct 16 19:08:54 2003
-+++ embed/mozilla/EventContext.cpp Thu Nov 13 19:05:29 2003
-@@ -145,13 +145,19 @@
- nsresult EventContext::ResolveBaseURL (nsIDocument *doc, const nsAString &relurl, nsACString &url)
- {
- nsresult rv;
-+#if MOZILLA_SNAPSHOT > 11
-+ nsIURI *base;
-+ base = doc->GetBaseURL ();
-+ if (base == NULL) return NS_ERROR_FAILURE;
-+#elif MOZILLA_SNAPSHOT > 9
- nsCOMPtr<nsIURI> base;
--#if MOZILLA_SNAPSHOT > 9
- rv = doc->GetBaseURL (getter_AddRefs(base));
-+ if (NS_FAILED(rv)) return rv;
- #else
-+ nsCOMPtr<nsIURI> base;
- rv = doc->GetBaseURL (*getter_AddRefs(base));
--#endif
- if (NS_FAILED(rv)) return rv;
-+#endif
-
- return base->Resolve (NS_ConvertUCS2toUTF8(relurl), url);
- }
-@@ -159,9 +165,15 @@
- nsresult EventContext::ResolveDocumentURL (nsIDocument *doc, const nsAString &relurl, nsACString &url)
- {
- nsresult rv;
-+#if MOZILLA_SNAPSHOT > 11
-+ nsIURI *uri;
-+ uri = doc->GetDocumentURL ();
-+ if (uri == NULL) return NS_ERROR_FAILURE;
-+#else
- nsCOMPtr<nsIURI> uri;
- rv = doc->GetDocumentURL(getter_AddRefs(uri));
- if (NS_FAILED(rv)) return rv;
-+#endif
-
- return uri->Resolve (NS_ConvertUCS2toUTF8(relurl), url);
- }
diff --git a/www/epiphany/files/patch-src_ephy-nautilus-view.c b/www/epiphany/files/patch-src_ephy-nautilus-view.c
deleted file mode 100644
index b9864eefb..000000000
--- a/www/epiphany/files/patch-src_ephy-nautilus-view.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/ephy-nautilus-view.c.orig Sat Oct 18 00:41:25 2003
-+++ src/ephy-nautilus-view.c Sat Nov 29 14:36:38 2003
-@@ -312,8 +312,8 @@
-
- g_return_val_if_fail (url, FALSE);
-
-- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view),
-- url, NULL);
-+ nautilus_view_open_location (NAUTILUS_VIEW (view), url,
-+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION, 0, NULL);
- }
-
- return FALSE;
-@@ -461,8 +461,8 @@
-
- ephy_embed_event_get_property (info, "link", &value);
-
-- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view),
-- g_value_get_string (value), NULL);
-+ nautilus_view_open_location (NAUTILUS_VIEW (view), g_value_get_string (value),
-+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION, 0, NULL);
- }
-
- static void
-@@ -480,8 +480,10 @@
-
- ephy_embed_event_get_property (info, "image", &value);
-
-- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view),
-- g_value_get_string (value), NULL);
-+ nautilus_view_open_location (NAUTILUS_VIEW (view),
-+ g_value_get_string (value),
-+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION,
-+ 0, NULL);
- }
-
- static void
-@@ -499,8 +501,11 @@
-
- ephy_embed_get_location (view->priv->embed, FALSE, &location);
-
-- nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view),
-- location, NULL);
-+ nautilus_view_open_location (NAUTILUS_VIEW (view),
-+ location,
-+ Nautilus_ViewFrame_OPEN_IN_NAVIGATION,
-+ 0, NULL);
-+
- g_free (location);
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 00:23:01 +0800