From 357b0c05ce39abe15fe90f424b72942130b8ee56 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 23 Dec 2007 22:31:01 +0000
Subject: Fixes for xr 1.9. Bug #503657.

svn path=/trunk/; revision=7805
---
 embed/mozilla/EphyDirectoryProvider.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'embed/mozilla')

diff --git a/embed/mozilla/EphyDirectoryProvider.cpp b/embed/mozilla/EphyDirectoryProvider.cpp
index f8ec21042..0719f95b1 100644
--- a/embed/mozilla/EphyDirectoryProvider.cpp
+++ b/embed/mozilla/EphyDirectoryProvider.cpp
@@ -40,6 +40,11 @@
 #include <nsIToolkitChromeRegistry.h>
 #include <nsNetUtil.h>
 
+#ifdef HAVE_GECKO_1_9
+#include <nsIArray.h>
+#include <nsIMutableArray.h>
+#endif
+
 #include "EphyDirectoryProvider.h"
 
 NS_IMPL_ISUPPORTS2 (EphyDirectoryProvider,
@@ -88,15 +93,27 @@ EphyDirectoryProvider::GetFiles (const char *prop,
 				   getter_AddRefs (chromeDir));
 		NS_ENSURE_SUCCESS (rv, rv);
 
+#ifdef HAVE_GECKO_1_9
+		nsCOMPtr<nsIMutableArray> 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);
 
 		rv = array->AppendElement (manifestDir);
 		rv |= array->AppendElement (chromeDir);
-		NS_ENSURE_SUCCESS (rv, rv);
+ 		NS_ENSURE_SUCCESS (rv, rv);
 
 		rv = NS_NewArrayEnumerator (_retval, array);
+#endif /* HAVE_GECKO_1_9 */
+
 		NS_ENSURE_SUCCESS (rv, rv);
 
 		rv = NS_SUCCESS_AGGREGATE_RESULT;
-- 
cgit v1.2.3