From 59343d34ec9570797dee2272399d5f165ee0d3b3 Mon Sep 17 00:00:00 2001
From: "dougt%netscape.com" <dougt%netscape.com>
Date: Wed, 16 Apr 2003 00:56:03 +0000
Subject: [PATCH] Must QI objects returned via nsISupports parameter type. Not
 part of the default build.

---
 intl/uconv/src/nsCharsetConverterManager.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp
index fb5557377850..197c468c6566 100644
--- a/intl/uconv/src/nsCharsetConverterManager.cpp
+++ b/intl/uconv/src/nsCharsetConverterManager.cpp
@@ -180,9 +180,12 @@ NS_IMETHODIMP nsCharsetConverterManager::GetUnicodeEncoder(
 
 #ifdef MOZ_USE_NATIVE_UCONV
   if (mNativeUC) {
+    nsCOMPtr<nsISupports> supports;
     mNativeUC->GetNativeConverter("UCS-2", 
                                   NS_LossyConvertUCS2toASCII(*aDest).get(),
-                                  getter_AddRefs(encoder));
+                                  getter_AddRefs(supports));
+
+    encoder = do_QueryInterface(supports);
 
     if (encoder) {
       NS_ADDREF(*aResult = encoder);
@@ -218,9 +221,12 @@ NS_IMETHODIMP nsCharsetConverterManager::GetUnicodeDecoder(
 
 #ifdef MOZ_USE_NATIVE_UCONV
   if (mNativeUC) {
+    nsCOMPtr<nsISupports> supports;
     mNativeUC->GetNativeConverter(NS_LossyConvertUCS2toASCII(*aSrc).get(),
                                   "UCS-2", 
-                                  getter_AddRefs(decoder));
+                                  getter_AddRefs(supports));
+    
+    decoder = do_QueryInterface(supports);
 
     if (decoder) {
       NS_ADDREF(*aResult = decoder);