зеркало из https://github.com/mozilla/gecko-dev.git
Changing the name of the prefs to xpinstall.foo
removing unused pref defines Removing a force true when asked if we were enabled.
This commit is contained in:
Родитель
4c24e5a54a
Коммит
018df96b21
|
@ -139,7 +139,7 @@ nsInstallTrigger::UpdateEnabled(PRBool* aReturn)
|
|||
|
||||
if ( NS_SUCCEEDED(rv) )
|
||||
{
|
||||
rv = prefs->GetBoolPref( (const char*) AUTOUPDATE_ENABLE_PREF, aReturn);
|
||||
rv = prefs->GetBoolPref( (const char*) XPINSTALL_ENABLE_PREF, aReturn);
|
||||
|
||||
if (NS_FAILED(rv))
|
||||
{
|
||||
|
@ -152,9 +152,7 @@ nsInstallTrigger::UpdateEnabled(PRBool* aReturn)
|
|||
{
|
||||
*aReturn = PR_FALSE; /* no prefs manager. set to false */
|
||||
}
|
||||
|
||||
//FIX!!!!!!!!!!
|
||||
*aReturn = PR_TRUE;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -64,14 +64,7 @@ class nsSoftwareUpdateNameSet : public nsIScriptExternalNameSet
|
|||
NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext);
|
||||
};
|
||||
|
||||
#define AUTOUPDATE_ENABLE_PREF "autoupdate.enabled"
|
||||
#define AUTOUPDATE_CONFIRM_PREF "autoupdate.confirm_install"
|
||||
#define CHARSET_HEADER "Charset"
|
||||
#define CONTENT_ENCODING_HEADER "Content-encoding"
|
||||
#define INSTALLER_HEADER "Install-Script"
|
||||
#define MOCHA_CONTEXT_PREFIX "autoinstall:"
|
||||
#define REG_SOFTUPDT_DIR "Netscape/Communicator/SoftwareUpdate/"
|
||||
#define LAST_REGPACK_TIME "LastRegPackTime"
|
||||
|
||||
#define XPINSTALL_ENABLE_PREF "xpinstall.enabled"
|
||||
#define XPINSTALL_DETAILS_PREF "xpinstall.show_details"
|
||||
|
||||
#endif
|
Загрузка…
Ссылка в новой задаче