galeon r8942 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Sat Feb  2 21:47:53 2008
New Revision: 8942
URL: http://svn.gnome.org/viewvc/galeon?rev=8942&view=rev

Log:
2008-02-02  Philip Langdale  <philipl alumni utexas net>

	* configure.in
	* mozilla/ExternalProtocolService.cpp: Support latested
	interface changes.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/mozilla/ExternalProtocolService.cpp

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Feb  2 21:47:53 2008
@@ -595,6 +595,40 @@
 	[result=no])
 AC_MSG_RESULT([$result])
 
+dnl nsExternalProtocolService::LoadURI was updated in 1.9
+dnl https://bugzilla.mozilla.org/show_bug.cgi?id=385065
+AC_MSG_CHECKING([whether nsExternalProtocolService::LoadURI takes InterfaceRequestor])
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(
+		[[#include <nsEmbedString.h>
+		  #include <nsIInterfaceRequestor.h>
+		  #include <nsIExternalProtocolService.h>]],
+		[[nsIExternalProtocolService *p;
+		  nsIInterfaceRequestor *req; nsIURI *uri;
+		 p->LoadURI(uri, req);]]
+	)],
+	[AC_DEFINE([HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI_WITH_IR],[1],
+	           [Define if nsExternalProtocolService::LoadURI takes InterfaceRequestor]) result=yes],
+	[result=no])
+AC_MSG_RESULT([$result])
+
+
+dnl nsExternalProtocolService::GetProtocolHandlerInfo was added in 1.9
+dnl https://bugzilla.mozilla.org/show_bug.cgi?id=391150
+AC_MSG_CHECKING([whether nsExternalProtocolService::GetProtocolHandlerInfo exists])
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(
+		[[#include <nsEmbedString.h>
+		  #include <nsIExternalProtocolService.h>]],
+		[[nsIExternalProtocolService *p;
+		  nsIHandlerInfo *info; nsEmbedCString s;
+		 p->GetProtocolHandlerInfo(s, &info);]]
+	)],
+	[AC_DEFINE([HAVE_NSIEXTERNALPROTOCOLSERVICE_GETPROTOCOLHANDLERINFO],[1],
+	           [Define if nsExternalProtocolService::GetProtocolHandlerInfo exists]) result=yes],
+	[result=no])
+AC_MSG_RESULT([$result])
+
 
 dnl nsPIExternalProtocolService was added in 1.7.5, but never
 dnl got into trunk (see the check above)

Modified: trunk/mozilla/ExternalProtocolService.cpp
==============================================================================
--- trunk/mozilla/ExternalProtocolService.cpp	(original)
+++ trunk/mozilla/ExternalProtocolService.cpp	Sat Feb  2 21:47:53 2008
@@ -95,14 +95,16 @@
 }
 
 #if defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI) || defined (HAVE_NSPIEXTERNALPROTOCOLSERVICE)
-NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURL, nsIPrompt *)
+NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURI, nsIPrompt *)
+#elif defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI_WITH_IR)
+NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURI, nsIInterfaceRequestor *aWindowContext)
 {
 	/* Under some circumstances, the mozilla implementation of
 	 * this asks the user whether they want to open the URI, e.g
 	 * webcal urls. I'm not convinced we need to bother with that
 	 * on linux:
 	 *  http://bugzilla.mozilla.org/show_bug.cgi?id=263546 */
-	return LoadUrl (aURL);
+	return LoadUrl (aURI);
 }
 #endif
 
@@ -181,3 +183,9 @@
 }
 #endif
 
+#ifdef HAVE_NSIEXTERNALPROTOCOLSERVICE_GETPROTOCOLHANDLERINFO
+NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfo(const nsACString & aProtocolScheme, nsIHandlerInfo **_retval)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+#endif