From f9886ab357060c1780e5b17accfdd5b4ab4e497c Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net" <bsmedberg%covad.net>
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

---
 toolkit/xre/nsAppRunner.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 24a70bd118c8..8aef73474dd2 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/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()