From 01db14eca3273578b13f886d3a6818eccd9812e6 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Mon, 17 Jan 2005 09:24:56 +0000 Subject: [PATCH] Bug 242467 The patch for bug 242212 breaks builder.rebuild for remote XUL patch by enndeakin@sympatico.ca r=jst sr=jst --- content/xul/templates/src/nsXULTemplateBuilder.cpp | 12 +++++++++--- dom/public/nsIDOMClassInfo.h | 1 + dom/src/base/nsDOMClassInfo.cpp | 7 +++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index ba5ca2eab833..6f0e128a86d1 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -203,9 +203,15 @@ nsXULTemplateBuilder::Init() return NS_OK; } -NS_IMPL_ISUPPORTS2(nsXULTemplateBuilder, - nsIXULTemplateBuilder, - nsIRDFObserver) +NS_IMPL_ADDREF(nsXULTemplateBuilder) +NS_IMPL_RELEASE(nsXULTemplateBuilder) + +NS_INTERFACE_MAP_BEGIN(nsXULTemplateBuilder) + NS_INTERFACE_MAP_ENTRY(nsIXULTemplateBuilder) + NS_INTERFACE_MAP_ENTRY(nsIRDFObserver) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULTemplateBuilder) + NS_INTERFACE_MAP_ENTRY_DOM_CLASSINFO(XULTemplateBuilder) +NS_INTERFACE_MAP_END //---------------------------------------------------------------------- // diff --git a/dom/public/nsIDOMClassInfo.h b/dom/public/nsIDOMClassInfo.h index 7170da2d670a..41fe6d2be1fd 100644 --- a/dom/public/nsIDOMClassInfo.h +++ b/dom/public/nsIDOMClassInfo.h @@ -225,6 +225,7 @@ enum nsDOMClassInfoID { eDOMClassInfo_ImageDocument_id, #ifdef MOZ_XUL + eDOMClassInfo_XULTemplateBuilder_id, eDOMClassInfo_XULTreeBuilder_id, #endif diff --git a/dom/src/base/nsDOMClassInfo.cpp b/dom/src/base/nsDOMClassInfo.cpp index 42711cb58a33..b0a75b59cacd 100644 --- a/dom/src/base/nsDOMClassInfo.cpp +++ b/dom/src/base/nsDOMClassInfo.cpp @@ -796,6 +796,9 @@ static nsDOMClassInfoData sClassInfoData[] = { nsIXPCScriptable::WANT_ENUMERATE) #ifdef MOZ_XUL + NS_DEFINE_CLASSINFO_DATA(XULTemplateBuilder, nsDOMGenericSH, + DEFAULT_SCRIPTABLE_FLAGS) + NS_DEFINE_CLASSINFO_DATA(XULTreeBuilder, nsDOMGenericSH, DEFAULT_SCRIPTABLE_FLAGS) #endif @@ -2261,6 +2264,10 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_END_WITH_XPATH #ifdef MOZ_XUL + DOM_CLASSINFO_MAP_BEGIN(XULTemplateBuilder, nsIXULTemplateBuilder) + DOM_CLASSINFO_MAP_ENTRY(nsIXULTemplateBuilder) + DOM_CLASSINFO_MAP_END + DOM_CLASSINFO_MAP_BEGIN(XULTreeBuilder, nsIXULTreeBuilder) DOM_CLASSINFO_MAP_ENTRY(nsIXULTreeBuilder) DOM_CLASSINFO_MAP_ENTRY(nsITreeView)