galeon r8944 - in trunk: . mozilla

[philipl svn gnome org]

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

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

	* mozilla/EphyDirectoryProvider.cpp: Update to cope
	with Gecko 1.9.



Modified:
   trunk/ChangeLog
   trunk/mozilla/EphyDirectoryProvider.cpp

Modified: trunk/mozilla/EphyDirectoryProvider.cpp
==============================================================================
--- trunk/mozilla/EphyDirectoryProvider.cpp	(original)
+++ trunk/mozilla/EphyDirectoryProvider.cpp	Sat Feb  2 22:48:12 2008
@@ -34,10 +34,16 @@
 #include <nsIDirectoryService.h>
 #include <nsISupportsArray.h>
 #include <nsIProperties.h>
+#include <nsComponentManagerUtils.h>
 #include <nsServiceManagerUtils.h>
 #include <nsXPCOM.h>
 #include <nsXPCOMCID.h>
 
+#ifdef HAVE_NSIMUTABLEARRAY_H
+#include <nsIArray.h>
+#include <nsIMutableArray.h>
+#endif
+
 #ifndef HAVE_NSDEPENDENTSTRING
 typedef nsEmbedString nsDependentString;
 typedef nsEmbedCString nsDependentCString;
@@ -89,6 +95,19 @@
 				   getter_AddRefs (chromeDir));
 		NS_ENSURE_SUCCESS (rv, rv);
 
+#ifdef HAVE_NSIMUTABLEARRAY_H
+		nsCOMPtr<nsIMutableArray> array;
+		array = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
+		if (!array) {
+			return NS_ERROR_OUT_OF_MEMORY;
+		}
+
+		rv = array->AppendElement (manifestDir, PR_FALSE);
+		rv |= array->AppendElement (chromeDir, PR_FALSE);
+		NS_ENSURE_SUCCESS (rv, rv);
+
+		rv = array->Enumerate(_retval);
+#else
 		nsCOMPtr<nsISupportsArray> array;
 		rv = NS_NewISupportsArray (getter_AddRefs (array));
 		NS_ENSURE_SUCCESS (rv, rv);
@@ -98,6 +117,7 @@
 		NS_ENSURE_SUCCESS (rv, rv);
 
 		rv = NS_NewArrayEnumerator (_retval, array);
+#endif
 		NS_ENSURE_SUCCESS (rv, rv);
 
 		rv = NS_SUCCESS_AGGREGATE_RESULT;