Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing bug 21025 - Profiles from N7 appear after installation. sr=sspitzer,r=varada

Browse Source 
git-svn-id: svn://10.0.0.236/branches/ISHMAIL_1_0_BRANCH@132814 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ssu%netscape.com
2002-11-01 08:53:07 +00:00
parent 8fdd9e44f1
commit 6d8f69ffb2
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/embedding/xre/nsAppRunner.cpp
View File

@@ -1358,14 +1358,24 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp,
NS_ASSERTION(NS_SUCCEEDED(rv), "Initializing AppleEvents failed");
#endif
NS_TIMELINE_ENTER("setup registry");
// Ask XPInstall if we need to autoregister anything new.
PRBool needAutoReg = NS_SoftwareUpdateNeedsAutoReg();
#ifdef DEBUG
// _Always_ autoreg if we're in a debug build, under the assumption
// that people are busily modifying components and will be angry if
// their changes aren't noticed.
nsComponentManager::AutoRegister(nsIComponentManagerObsolete::NS_Startup,
NULL /* default */);
needAutoReg = PR_TRUE;
#endif
if (needAutoReg) {
nsComponentManager::AutoRegister(nsIComponentManagerObsolete::NS_Startup,
NULL /* default */);
// XXX ...and autoreg was successful?
NS_SoftwareUpdateDidAutoReg();
}
NS_TIMELINE_LEAVE("setup registry");
// remove the nativeApp as an XPCOM autoreg observer
if (obsService)

18
mozilla/mailnews/app/nsMailApp.cpp
View File

@@ -48,24 +48,6 @@ int main(int argc, char* argv[])
appData.SetSplashEnabled(PR_FALSE);
appData.SetProductName(NS_LITERAL_CSTRING("Minotaur"));
appData.SetUseStartupPrefs(PR_TRUE);
// Ask XPInstall if we need to autoregister anything new.
PRBool needAutoReg = NS_SoftwareUpdateNeedsAutoReg();
#ifdef DEBUG
// _Always_ autoreg if we're in a debug build, under the assumption
// that people are busily modifying components and will be angry if
// their changes aren't noticed.
needAutoReg = PR_TRUE;
#endif
if (needAutoReg) {
nsComponentManager::AutoRegister(nsIComponentManagerObsolete::NS_Startup,
NULL /* default */);
// XXX ...and autoreg was successful?
NS_SoftwareUpdateDidAutoReg();
}
return xre_main(argc, argv, appData);
}