зеркало из https://github.com/mozilla/gecko-dev.git
unbuilding deprecated prompt files (cleaning up my mess)
This commit is contained in:
danm%netscape.com
Родитель
97f2f03260
Коммит
9be7be64f3
|
|
@ -33,7 +33,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
|
|||
|
||||
static nsModuleComponentInfo components[] = {
|
||||
|
||||
//{ "Dialog ParamBlock", NS_DIALOGPARAMBLOCK_CID, NS_DIALOGPARAMBLOCK_CONTRACTID, nsDialogParamBlockConstructor },
|
||||
{ "Dialog ParamBlock", NS_DIALOGPARAMBLOCK_CID, NS_DIALOGPARAMBLOCK_CONTRACTID, nsDialogParamBlockConstructor },
|
||||
{ "Prompt Service", NS_PROMPTSERVICE_CID, NS_PROMPTSERVICE_CONTRACTID, nsPromptServiceConstructor },
|
||||
{ "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor },
|
||||
{ NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
|
||||
#include "nsIDialogParamBlock.h"
|
||||
|
||||
// {c01ad085-4915-11d3-b7a0-85cf55c3523c}
|
||||
// {4E4AAE11-8901-46cc-8217-DAD7C5415873}
|
||||
#define NS_DIALOGPARAMBLOCK_CID \
|
||||
{0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}}
|
||||
{0x4e4aae11, 0x8901, 0x46cc, {0x82, 0x17, 0xda, 0xd7, 0xc5, 0x41, 0x58, 0x73}}
|
||||
#define NS_DIALOGPARAMBLOCK_CONTRACTID \
|
||||
"@mozilla.org/embedcomp/dialogparam;1"
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include "nsIDialogParamBlock.h"
|
||||
|
||||
static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
|
||||
static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
|
||||
static NS_DEFINE_CID(kPrintOptionsCID, NS_PRINTOPTIONS_CID);
|
||||
|
||||
//#include "prmem.h"
|
||||
|
|
@ -157,7 +156,7 @@ NS_IMETHODIMP nsDeviceContextSpecGTK :: Init(PRBool aQuiet)
|
|||
rv = NS_OK;
|
||||
nsCOMPtr<nsIDialogParamBlock> ioParamBlock;
|
||||
|
||||
rv = nsComponentManager::CreateInstance(kDialogParamBlockCID,
|
||||
rv = nsComponentManager::CreateInstance("@mozilla.org/embedcomp/dialogparam;1",
|
||||
nsnull,
|
||||
NS_GET_IID(nsIDialogParamBlock),
|
||||
getter_AddRefs(ioParamBlock));
|
||||
|
|
|
|||
Двоичные данные
xpfe/appshell/macbuild/AppShell.mcp
Двоичные данные
xpfe/appshell/macbuild/AppShell.mcp
Двоичный файл не отображается.
Двоичные данные
xpfe/appshell/macbuild/appshellIDL.mcp
Двоичные данные
xpfe/appshell/macbuild/appshellIDL.mcp
Двоичный файл не отображается.
|
|
@ -4,8 +4,6 @@
|
|||
|
||||
nsIAppShellService.idl
|
||||
nsICmdLineService.idl
|
||||
nsICommonDialogs.idl
|
||||
nsIDialogParamBlock.idl
|
||||
nsIFileLocator.idl
|
||||
nsIWindowMediator.idl
|
||||
nsIXULWindow.idl
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ EXPORTS = \
|
|||
nsAppShellCIDs.h \
|
||||
nsFileLocations.h \
|
||||
nsIDOMXPConnectFactory.h \
|
||||
nsINetSupportDialogService.h \
|
||||
nsISplashScreen.h \
|
||||
nsINativeAppSupport.h \
|
||||
$(NULL)
|
||||
|
|
@ -43,8 +42,6 @@ XPIDLSRCS = \
|
|||
nsIAppShellService.idl \
|
||||
nsICmdLineService.idl \
|
||||
nsICmdLineHandler.idl \
|
||||
nsICommonDialogs.idl \
|
||||
nsIDialogParamBlock.idl \
|
||||
nsIFileLocator.idl \
|
||||
nsIWindowMediator.idl \
|
||||
nsIXULWindow.idl \
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ XPIDLSRCS = \
|
|||
.\nsIAppShellService.idl \
|
||||
.\nsICmdLineService.idl \
|
||||
.\nsICmdLineHandler.idl \
|
||||
.\nsICommonDialogs.idl \
|
||||
.\nsIDialogParamBlock.idl \
|
||||
.\nsIFileLocator.idl \
|
||||
.\nsIWindowMediator.idl \
|
||||
.\nsIXULWindow.idl \
|
||||
|
|
@ -42,7 +40,6 @@ EXPORTS = \
|
|||
nsAppShellCIDs.h \
|
||||
nsIDOMXPConnectFactory.h \
|
||||
nsFileLocations.h \
|
||||
nsINetSupportDialogService.h \
|
||||
nsISplashScreen.h \
|
||||
nsINativeAppSupport.h \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -45,10 +45,7 @@ CPPSRCS = \
|
|||
nsJSXPConnectFactory.cpp \
|
||||
nsAppShellNameSet.cpp \
|
||||
nsFileLocations.cpp \
|
||||
nsNetSupportDialog.cpp \
|
||||
nsWindowMediator.cpp \
|
||||
nsDialogParamBlock.cpp \
|
||||
nsCommonDialogs.cpp \
|
||||
nsAbout.cpp \
|
||||
nsAppShellFactory.cpp \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -39,10 +39,7 @@ CPP_OBJS= \
|
|||
.\$(OBJDIR)\nsJSXPConnectFactory.obj \
|
||||
.\$(OBJDIR)\nsAppShellNameSet.obj \
|
||||
.\$(OBJDIR)\nsFileLocations.obj \
|
||||
.\$(OBJDIR)\nsNetSupportDialog.obj \
|
||||
.\$(OBJDIR)\nsWindowMediator.obj \
|
||||
.\$(OBJDIR)\nsDialogParamBlock.obj \
|
||||
.\$(OBJDIR)\nsCommonDialogs.obj \
|
||||
.\$(OBJDIR)\nsAbout.obj \
|
||||
.\$(OBJDIR)\nsUserInfoWin.obj \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@
|
|||
#include "nsIFileLocator.h"
|
||||
#include "nsIWindowMediator.h"
|
||||
#include "rdf.h"
|
||||
#include "nsICommonDialogs.h"
|
||||
#include "nsIDialogParamBlock.h"
|
||||
#include "nsAbout.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
|
||||
|
|
@ -39,8 +37,6 @@
|
|||
#include "nsAppShellService.h"
|
||||
#include "nsXPConnectFactory.h"
|
||||
#include "nsWindowMediator.h"
|
||||
#include "nsCommonDialogs.h"
|
||||
#include "nsDialogParamBlock.h"
|
||||
#include "nsFileLocations.h"
|
||||
|
||||
#ifdef XP_MAC
|
||||
|
|
@ -60,8 +56,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCmdLineService);
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppShellService);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(XPConnectFactoryImpl);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowMediator);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommonDialogs);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFileLocator);
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo);
|
||||
|
||||
|
|
@ -87,16 +81,6 @@ static nsModuleComponentInfo gAppShellModuleInfo[] =
|
|||
NS_RDF_DATASOURCE_CONTRACTID_PREFIX "window-mediator",
|
||||
nsWindowMediatorConstructor,
|
||||
},
|
||||
{ "Common Dialogs",
|
||||
NS_CommonDialog_CID,
|
||||
"@mozilla.org/appshell/commonDialogs;1",
|
||||
nsCommonDialogsConstructor,
|
||||
},
|
||||
{ "kDialogParamBlockCID",
|
||||
NS_DialogParamBlock_CID,
|
||||
NULL,
|
||||
nsDialogParamBlockConstructor,
|
||||
},
|
||||
{ "kAboutModuleCID",
|
||||
NS_ABOUT_CID,
|
||||
NS_ABOUT_MODULE_CONTRACTID_PREFIX,
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
|
||||
|
||||
static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
|
||||
|
||||
nsInstallProgressDialog::nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager)
|
||||
: mManager(aManager)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
|||
static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
|
||||
static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID);
|
||||
static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
|
||||
static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
|
||||
|
||||
#include "nsIEventQueueService.h"
|
||||
|
||||
|
|
@ -185,7 +184,7 @@ nsXPInstallManager::InitManager(nsIScriptGlobalObject* aGlobalObject, nsXPITrigg
|
|||
// Create the nsIDialogParamBlock to pass the trigger
|
||||
// list to the dialog
|
||||
//-----------------------------------------------------
|
||||
rv = nsComponentManager::CreateInstance(kDialogParamBlockCID,
|
||||
rv = nsComponentManager::CreateInstance("@mozilla.org/embedcomp/dialogparam;1",
|
||||
nsnull,
|
||||
NS_GET_IID(nsIDialogParamBlock),
|
||||
getter_AddRefs(ioParamBlock));
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче