From d980ad10cf3932df45fd44ccbedd5dc6da04af03 Mon Sep 17 00:00:00 2001 From: "mcmullen%netscape.com" Date: Wed, 9 Jun 1999 20:42:55 +0000 Subject: [PATCH] Removed PrefsCore from appcores - it's now an autoregistered, idlized component. git-svn-id: svn://10.0.0.236/trunk@34483 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/AppCores/idl/makefile.win | 1 - mozilla/xpfe/AppCores/macbuild/AppCores.mcp | Bin 70959 -> 70959 bytes mozilla/xpfe/AppCores/public/Makefile.in | 1 - mozilla/xpfe/AppCores/public/makefile.win | 1 - mozilla/xpfe/AppCores/public/nsAppCoresCIDs.h | 5 ---- mozilla/xpfe/AppCores/src/Makefile.in | 3 -- mozilla/xpfe/AppCores/src/makefile.win | 28 ------------------ mozilla/xpfe/AppCores/src/nsAppCores.cpp | 7 ----- .../xpfe/AppCores/src/nsAppCoresNameSet.cpp | 10 ------- mozilla/xpfe/AppCores/xul/Makefile.in | 22 -------------- 10 files changed, 78 deletions(-) diff --git a/mozilla/xpfe/AppCores/idl/makefile.win b/mozilla/xpfe/AppCores/idl/makefile.win index 88373875fb3..5a87fa3320d 100644 --- a/mozilla/xpfe/AppCores/idl/makefile.win +++ b/mozilla/xpfe/AppCores/idl/makefile.win @@ -34,7 +34,6 @@ IDLSRCS= \ BrowserAppCore.idl \ DOMPropsCore.idl \ EditorAppCore.idl \ - PrefsCore.idl \ SignonCore.idl \ CookieCore.idl \ WalletCore.idl \ diff --git a/mozilla/xpfe/AppCores/macbuild/AppCores.mcp b/mozilla/xpfe/AppCores/macbuild/AppCores.mcp index 7d35cbef93722e2a80a7b41b019aeb02fc631294..26c841e8d8e31d5bd24e03691bb69060bdec261f 100644 GIT binary patch delta 253 zcmZ3#ie>#OmJO>}8BHdyVKrwo+5Ci6l4&w0N8n^Xj;-uX*JBtMgtl(x;uL3M6rB8^ z(Rp$)huh?Z9O9b~aX&HHEa<JlWbs1B5qQyL7WozT_FWS==j{nZ4;s9|ME-!Oe=C zzZoZ&_=|xA{{KH%3l#XtIN3m-WpZDj7Ng+ioq-CBo7sa+nXDPWz=1X9w?a{TNl{{E zNwH12oes;K)`pT4L!-o;oc!d(lKdi|pj~KAXbw|*qe7R2duoYK{^pH!=1iL#!kIQ~ r|HaPe$~;}1n^6NyYzMO1nHVojpU=zK&)73vpASe~*uI~Sv49N#J)Tu+ delta 276 zcmZ3#ie>#OmJO>}8O install:: $(DLL) $(MAKE_INSTALL) $(DLL) $(DIST)\bin $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib - $(MAKE_INSTALL) ..\xul\pref-advanced.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-applications.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-appearance.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-cache.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-colors.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-composer.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-download.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-fonts.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-languages.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-navigator.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-offline.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-proxies.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-publish.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-select.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-smart_browsing.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref-smartupdate.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\pref.css $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\prefbottom.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\PrefsWindow.html $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\PrefsWindow.js $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\SignonWindow.js $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\CookieWindow.js $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\WalletWindow.js $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\preftree.css $(DIST)\bin\res\samples - $(MAKE_INSTALL) ..\xul\preftree.xul $(DIST)\bin\res\samples $(MAKE_INSTALL) ..\xul\resources\Mail_SendMsg.gif $(DIST)\bin\res\toolbar $(MAKE_INSTALL) ..\xul\resources\Mail_GetMsg.gif $(DIST)\bin\res\toolbar diff --git a/mozilla/xpfe/AppCores/src/nsAppCores.cpp b/mozilla/xpfe/AppCores/src/nsAppCores.cpp index 79a168d9b14..4f8ca0e1e92 100644 --- a/mozilla/xpfe/AppCores/src/nsAppCores.cpp +++ b/mozilla/xpfe/AppCores/src/nsAppCores.cpp @@ -42,7 +42,6 @@ static PRInt32 gInstanceCnt = 0; static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); static NS_DEFINE_IID(kDOMPropsCoreCID, NS_DOMPROPSCORE_CID); -static NS_DEFINE_IID(kPrefsCoreCID, NS_PREFSCORE_CID); static NS_DEFINE_IID(kSignonCoreCID, NS_SIGNONCORE_CID); static NS_DEFINE_IID(kCookieCoreCID, NS_COOKIECORE_CID); static NS_DEFINE_IID(kWalletCoreCID, NS_WALLETCORE_CID); @@ -71,7 +70,6 @@ NSRegisterSelf(nsISupports* serviceMgr, const char *path) printf("*** AppCores object is being registered\n"); nsComponentManager::RegisterComponent(kAppCoresManagerCID, NULL, NULL, path, PR_TRUE, PR_TRUE); nsComponentManager::RegisterComponent(kDOMPropsCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE); - nsComponentManager::RegisterComponent(kPrefsCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE); nsComponentManager::RegisterComponent(kSignonCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE); nsComponentManager::RegisterComponent(kCookieCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE); nsComponentManager::RegisterComponent(kWalletCoreCID, NULL, NULL, path, PR_TRUE, PR_TRUE); @@ -91,7 +89,6 @@ NSUnregisterSelf(nsISupports* serviceMgr, const char *path) nsComponentManager::UnregisterComponent(kAppCoresManagerCID, path); nsComponentManager::UnregisterComponent(kDOMPropsCoreCID, path); - nsComponentManager::UnregisterComponent(kPrefsCoreCID, path); nsComponentManager::UnregisterComponent(kSignonCoreCID, path); nsComponentManager::UnregisterComponent(kCookieCoreCID, path); nsComponentManager::UnregisterComponent(kWalletCoreCID, path); @@ -130,10 +127,6 @@ NSGetFactory(nsISupports* serviceMgr, { inst = new nsDOMPropsCoreFactory(); } - else if ( aClass.Equals(kPrefsCoreCID) ) - { - inst = new nsPrefsCoreFactory(); - } else if ( aClass.Equals(kSignonCoreCID) ) { inst = new nsSignonCoreFactory(); diff --git a/mozilla/xpfe/AppCores/src/nsAppCoresNameSet.cpp b/mozilla/xpfe/AppCores/src/nsAppCoresNameSet.cpp index 042c3796c72..474c3091ffb 100644 --- a/mozilla/xpfe/AppCores/src/nsAppCoresNameSet.cpp +++ b/mozilla/xpfe/AppCores/src/nsAppCoresNameSet.cpp @@ -43,7 +43,6 @@ static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID); static NS_DEFINE_IID(kAppCoresCID, NS_APPCORESMANAGER_CID); static NS_DEFINE_IID(kToolkitCoreCID, NS_TOOLKITCORE_CID); static NS_DEFINE_IID(kDOMPropsCoreCID, NS_DOMPROPSCORE_CID); -static NS_DEFINE_IID(kPrefsCoreCID, NS_PREFSCORE_CID); static NS_DEFINE_IID(kSignonCoreCID, NS_SIGNONCORE_CID); static NS_DEFINE_IID(kCookieCoreCID, NS_COOKIECORE_CID); static NS_DEFINE_IID(kWalletCoreCID, NS_WALLETCORE_CID); @@ -76,7 +75,6 @@ nsAppCoresNameSet::InitializeClasses(nsIScriptContext* aScriptContext) if (NS_OK != result) return result; result = NS_InitDOMPropsCoreClass(aScriptContext, nsnull); - result = NS_InitPrefsCoreClass(aScriptContext, nsnull); result = NS_InitSignonCoreClass(aScriptContext, nsnull); result = NS_InitCookieCoreClass(aScriptContext, nsnull); result = NS_InitWalletCoreClass(aScriptContext, nsnull); @@ -108,14 +106,6 @@ nsAppCoresNameSet::AddNameSet(nsIScriptContext* aScriptContext) if (NS_OK != result) return result; - result = manager->RegisterGlobalName("PrefsCore", - kPrefsCoreCID, - PR_TRUE); - - if (NS_OK != result) return result; - - - result = manager->RegisterGlobalName("SignonCore", kSignonCoreCID, PR_TRUE); diff --git a/mozilla/xpfe/AppCores/xul/Makefile.in b/mozilla/xpfe/AppCores/xul/Makefile.in index 4baa3892c54..8c58194204c 100644 --- a/mozilla/xpfe/AppCores/xul/Makefile.in +++ b/mozilla/xpfe/AppCores/xul/Makefile.in @@ -25,31 +25,9 @@ include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk EXPORT_RESOURCE_SAMPLES = \ - $(srcdir)/pref-advanced.html \ - $(srcdir)/pref-applications.html \ - $(srcdir)/pref-appearance.html \ - $(srcdir)/pref-cache.html \ - $(srcdir)/pref-colors.html \ - $(srcdir)/pref-composer.html \ - $(srcdir)/pref-download.html \ - $(srcdir)/pref-fonts.html \ - $(srcdir)/pref-languages.html \ - $(srcdir)/pref-navigator.html \ - $(srcdir)/pref-offline.html \ - $(srcdir)/pref-proxies.html \ - $(srcdir)/pref-publish.html \ - $(srcdir)/pref-select.html \ - $(srcdir)/pref-smart_browsing.html \ - $(srcdir)/pref-smartupdate.html \ - $(srcdir)/prefbottom.html \ - $(srcdir)/PrefsWindow.html \ - $(srcdir)/PrefsWindow.js \ $(srcdir)/SignonWindow.js \ $(srcdir)/CookieWindow.js \ $(srcdir)/WalletWindow.js \ - $(srcdir)/preftree.css \ - $(srcdir)/preftree.xul \ - $(srcdir)/pref.css \ $(NULL) EXPORT_RESOURCE_TOOLBAR = \