Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove xpinstall's dependency on nsIAppShellComponent*.h

Browse Source 
sr=sfraser bug 76339
This commit is contained in:
alecf%netscape.com 2001-09-25 14:56:47 +00:00
parent e201a0b7b2
commit 50b1749628
10 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xpinstall/public/nsISoftwareUpdate.h
View File

@ -40,7 +40,7 @@
#include "nsIRegistry.h"
#include "nsIRegistryUtils.h"
#define NS_IXPINSTALLCOMPONENT_CONTRACTID NS_IAPPSHELLCOMPONENT_CONTRACTID "/xpinstall;1"
#define NS_IXPINSTALLCOMPONENT_CONTRACTID "@mozilla.org/xpinstall;1"
#define NS_IXPINSTALLCOMPONENT_CLASSNAME "Mozilla XPInstall Component"
#define XPINSTALL_ENABLE_PREF "xpinstall.enabled"

2
xpinstall/src/makefile.win
View File

@ -47,11 +47,9 @@ REQUIRES = xpcom \
xpconnect \
docshell \
dom \
appcomps \
windowwatcher \
zlib \
content \
raptor \
$(NULL)
include <$(DEPTH)/config/config.mak>

14
xpinstall/src/nsInstallProgressDialog.cpp
View File

@ -26,7 +26,7 @@
#include "nsInstallProgressDialog.h"
#include "nsIAppShellComponentImpl.h"
#include "prprf.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
@ -291,12 +291,10 @@ nsresult nsInstallProgressDialog::setDlgAttribute( const char *id,
rv = elem->SetAttribute( NS_ConvertASCIItoUCS2(name), value );
if ( NS_SUCCEEDED( rv ) ) {
} else {
DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
__FILE__, (int)__LINE__, (int)rv );
NS_WARNING("SetAttribute failed");
}
} else {
DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
__FILE__, (int)__LINE__, (int)rv );
NS_WARNING("GetElementById failed");
}
} else {
rv = NS_ERROR_NULL_POINTER;
@ -331,12 +329,10 @@ nsresult nsInstallProgressDialog::getDlgAttribute( const char *id,
rv = elem->GetAttribute( NS_ConvertASCIItoUCS2(name), value );
if ( NS_SUCCEEDED( rv ) ) {
} else {
DEBUG_PRINTF( PR_STDOUT, "%s %d: GetAttribute failed, rv=0x%X\n",
__FILE__, (int)__LINE__, (int)rv );
NS_WARNING("GetAttribute failed");
}
} else {
DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
__FILE__, (int)__LINE__, (int)rv );
NS_WARNING("GetElementById failed");
}
} else {
rv = NS_ERROR_NULL_POINTER;

2
xpinstall/src/nsInstallTrigger.h
View File

@ -57,5 +57,5 @@ class nsInstallTrigger: public nsIScriptObjectOwner,
NS_IMETHOD InitRegistry(void);
};
#define NS_INSTALLTRIGGERCOMPONENT_CONTRACTID NS_IAPPSHELLCOMPONENT_CONTRACTID "/xpinstall/installtrigger;1"
#define NS_INSTALLTRIGGERCOMPONENT_CONTRACTID "@mozilla.org/xpinstall/installtrigger;1"
#endif

2
xpinstall/src/nsInstallVersion.h
View File

@ -56,5 +56,5 @@ class nsInstallVersion: public nsIScriptObjectOwner, public nsIDOMInstallVersion
};
#define NS_INSTALLVERSIONCOMPONENT_CONTRACTID NS_IAPPSHELLCOMPONENT_CONTRACTID "/xpinstall/installversion;1"
#define NS_INSTALLVERSIONCOMPONENT_CONTRACTID "@mozilla.org/xpinstall/installversion;1"
#endif

1
xpinstall/src/nsSoftwareUpdate.h
View File

@ -18,7 +18,6 @@
class nsInstallInfo;
#include "nsIScriptExternalNameSet.h"
#include "nsIAppShellComponent.h"
#include "nsIDOMWindowInternal.h"
#include "nsIObserver.h"
#include "nsPIXPIStubHook.h"

1
xpinstall/src/nsXPInstallManager.cpp
View File

@ -58,7 +58,6 @@
#include "nsAppDirectoryServiceDefs.h"
#include "nsProxiedService.h"
#include "nsIAppShellComponentImpl.h"
#include "nsIPromptService.h"
#include "nsIScriptGlobalObject.h"
#include "nsISupportsPrimitives.h"

1
xpinstall/stub/makefile.win
View File

@ -26,6 +26,7 @@ DEPTH=..\..
REQUIRES = xpcom \
string \
dom \
appshell \
appcomps \
xpinstall \
$(NULL)

8
xpinstall/wizard/libxpnet/src/nsFTPConn.cpp
View File

@ -95,12 +95,10 @@ nsFTPConn::Open()
DUMP(resp);
/* issue USER command on control connection */
sprintf(cmd, "USER anonymous\r\n");
err = IssueCmd(cmd, resp, kRespBufSize, mCntlSock);
err = IssueCmd("USER anonymous\r\n", resp, kRespBufSize, mCntlSock);
/* issue PASS command on control connection */
sprintf(cmd, "PASS -linux@installer.sbg\r\n");
ERR_CHECK(IssueCmd(cmd, resp, kRespBufSize, mCntlSock));
ERR_CHECK(IssueCmd("PASS -linux@installer.sbg\r\n", resp, kRespBufSize, mCntlSock));
mState = OPEN;
@ -394,7 +392,7 @@ BAIL:
}
int
nsFTPConn::IssueCmd(char *aCmd, char *aResp, int aRespSize, nsSocket *aSock)
nsFTPConn::IssueCmd(const char *aCmd, char *aResp, int aRespSize, nsSocket *aSock)
{
int err = OK;
int len;

2
xpinstall/wizard/libxpnet/src/nsFTPConn.h
View File

@ -85,7 +85,7 @@ public:
private:
int FlushCntlSock(nsSocket *aSock, int bailOnTimeOut = 1);
int IssueCmd(char *aCmd, char *aResp, int aRespSize,
int IssueCmd(const char *aCmd, char *aResp, int aRespSize,
nsSocket *aSock);
int ParseAddr(char *aBuf, char **aHost, int *aPort);
int DataInit(char *aHost, int aPort, nsSocket **aSock);