galeon r8934 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Sat Feb  2 19:14:48 2008
New Revision: 8934
URL: http://svn.gnome.org/viewvc/galeon?rev=8934&view=rev

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

	* configure.in
	* mozilla/ContentHandler.cpp
	* mozilla/ProgressListener.cpp: Some gecko 1.9 updates.
	The actualy GECKO_1_9 test is bogus (It's really a xulrunner
	1.9 test) and I'll fix it up later.



Modified:
   trunk/configure.in
   trunk/mozilla/ContentHandler.cpp
   trunk/mozilla/ProgressListener.cpp

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Feb  2 19:14:48 2008
@@ -311,6 +311,24 @@
 done
 CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1"
 
+dnl Check whether we have gecko 1.9
+
+AC_MSG_CHECKING([[whether we have a gecko 1.9 build]])
+
+AC_PREPROC_IFELSE(
+	[AC_LANG_SOURCE(
+		[[#include <mozilla-config.h>
+		  #if defined(MOZ_XULRUNNER) && !defined(MOZILLA_1_8_BRANCH)
+		  #error Yes
+		  #endif]]
+	)],
+	[result=no],
+	[AC_DEFINE([HAVE_GECKO_1_9],[1],
+	           [Define if we have gecko 1.9]) result=yes])
+
+AC_MSG_RESULT([$result])
+AM_CONDITIONAL([HAVE_GECKO_1_9], [test "$result" = "yes"])
+
 dnl Check whether we have a mozilla debug build
 
 AC_MSG_CHECKING([[whether we have a mozilla debug build]])
@@ -354,7 +372,8 @@
 		[[#include <nsEmbedString.h>
 		  #include <nsIMIMEInfo.h>]],
 		[[nsIMIMEInfo *p;
-		  p->SetDescription (nsEmbedString());]]
+		  nsEmbedCString s;
+		  p->GetMIMEType (s);]]
 	)],
 	[AC_DEFINE([HAVE_NSIMIMEINFO_NSASTRING],[1],
 	           [Define if nsIMIMEInfo uses nsAString&]) result=yes],
@@ -362,6 +381,38 @@
 
 AC_MSG_RESULT([$result])
 
+dnl ApplicationDescription renamed to Description
+dnl https://bugzilla.mozilla.org/show_bug.cgi?id=384374
+AC_MSG_CHECKING([for nsIMIMEInfo::SetDescription])
+
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(
+		[[#include <nsEmbedString.h>
+		  #include <nsIMIMEInfo.h>]],
+		[[nsIMIMEInfo *p;
+		  p->SetDescription (nsEmbedString());]]
+	)],
+	[AC_DEFINE([HAVE_NSIMIMEINFO_SETDESCRIPTION],[1],
+	           [Define if nsIMIMEInfo::SetDescription exists]) result=yes],
+	[result=no])
+
+AC_MSG_RESULT([$result])
+
+dnl nsMIMEInfoHandleAction renamed to nsHandlerInfoAction
+dnl https://bugzilla.mozilla.org/show_bug.cgi?id=384374
+AC_MSG_CHECKING([for nsHandlerInfoAction])
+
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(
+		[[#include <nsIMIMEInfo.h>]],
+		[[nsHandlerInfoAction a;]]
+	)],
+	[AC_DEFINE([HAVE_NSHANDLERINFOACTION],[1],
+	           [Define if nsHandlerInfoAction exists]) result=yes],
+	[result=no])
+
+AC_MSG_RESULT([$result])
+
 dnl Changed from char* to nsACString& in 1.8a6
 dnl https://bugzilla.mozilla.org/show_bug.cgi?id=277627
 AC_MSG_CHECKING([whether nsICacheSession methods expect nsACString&])
@@ -386,14 +437,12 @@
 AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM(
 		[[#include <nsIURI.h>
-		  #include <nsIGlobalHistory.h>
-		  #include <nsIGlobalHistory2.h>
-		  #include <nsIBrowserHistory.h>]],
-		[[nsIBrowserHistory *p;
+		  #include <nsIGlobalHistory2.h>]],
+		[[nsIGlobalHistory2 *p;
 		  p->AddURI(nsnull,PR_FALSE,PR_FALSE,nsnull);]]
 	)],
 	[AC_DEFINE([HAVE_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER],[1],
-	           [Define if nsIBrowserHistory::AddURI takes the referrer argument]) result=yes],
+	           [Define if nsIGlobalHistory2::AddURI takes the referrer argument]) result=yes],
 	[result=no])
 
 AC_MSG_RESULT([$result])

Modified: trunk/mozilla/ContentHandler.cpp
==============================================================================
--- trunk/mozilla/ContentHandler.cpp	(original)
+++ trunk/mozilla/ContentHandler.cpp	Sat Feb  2 19:14:48 2008
@@ -499,12 +499,16 @@
 	char * info = g_strdup_printf ("%d:%s", gtk_get_current_event_time(),
 				       id);
 
+#ifdef HAVE_NSIMIMEINFO_SETDESCRIPTION
+	rv = mimeInfo->SetDescription(GulString(info));
+#else
 	rv = mimeInfo->SetApplicationDescription
 #ifdef HAVE_NSIMIMEINFO_NSASTRING
 		(GulString(info));
 #else
 		(GulString(info).get());
 #endif
+#endif
 	g_free (info);
 
 	if(NS_FAILED(rv)) return NS_ERROR_FAILURE;

Modified: trunk/mozilla/ProgressListener.cpp
==============================================================================
--- trunk/mozilla/ProgressListener.cpp	(original)
+++ trunk/mozilla/ProgressListener.cpp	Sat Feb  2 19:14:48 2008
@@ -228,7 +228,11 @@
 
 	if (aMIMEInfo)
 	{
+#ifdef HAVE_NSHANDLERINFOACTION
+		nsHandlerInfoAction action;
+#else
 		nsMIMEInfoHandleAction action;
+#endif
 		if (NS_SUCCEEDED(aMIMEInfo->GetPreferredAction(&action)))
 		{
 			if (action == nsIMIMEInfo::useHelperApp)
@@ -729,6 +733,9 @@
 	if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
 
 	GulString helperDesc;
+#ifdef HAVE_NSIMIMEINFO_SETDESCRIPTION
+	rv = mMIMEInfo->GetDescription(helperDesc);
+#else
 #ifdef HAVE_NSIMIMEINFO_NSASTRING
 	rv = mMIMEInfo->GetApplicationDescription(helperDesc);
 #else
@@ -737,6 +744,7 @@
 	helperDesc = tmp;
 	nsMemory::Free (tmp);
 #endif
+#endif
 	if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
 
 	// XXX information passing kludge (from ContentHandler)