From 4fbd057c4dcbc90c8dd03e0ab37f15bb91ea25bb Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net"
 <bsmedberg%covad.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 8 Aug 2005 13:54:38 +0000
Subject: [PATCH] Bug 302794 - mfcembed (and other embedding apps) crash on
 startup [@nsXULAppInfo::GetID] - r=timeless+darin a=chase

git-svn-id: svn://10.0.0.236/trunk@177324 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/xre/nsAppRunner.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp
index 24a70bd118c..8aef73474dd 100644
--- a/mozilla/toolkit/xre/nsAppRunner.cpp
+++ b/mozilla/toolkit/xre/nsAppRunner.cpp
@@ -371,9 +371,11 @@ public:
   NS_DECL_NSIXULRUNTIME
 };
 
-NS_IMPL_QUERY_INTERFACE2(nsXULAppInfo,
-                         nsIXULAppInfo,
-                         nsIXULRuntime)
+NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULRuntime)
+  NS_INTERFACE_MAP_ENTRY(nsIXULRuntime)
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIXULAppInfo, gAppData)
+NS_INTERFACE_MAP_END
 
 NS_IMETHODIMP_(nsrefcnt)
 nsXULAppInfo::AddRef()