Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 852409 - Change XREMain::XRE_mainInit() method to use mAppData instead of aAppData which is given as parameter. r=jmathies

Browse Source
This commit is contained in:
leo.bugzilla.gecko@gmail.com 2013-03-27 11:19:10 -04:00
parent 5cc5056451
commit 7f2d5d2f64
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/xre/nsAppRunner.cpp
View File

@ -2788,7 +2788,7 @@ public:
}
int XRE_main(int argc, char* argv[], const nsXREAppData* aAppData);
int XRE_mainInit(const nsXREAppData* aAppData, bool* aExitFlag);
int XRE_mainInit(bool* aExitFlag);
int XRE_mainStartup(bool* aExitFlag);
nsresult XRE_mainRun();
@ -2824,7 +2824,7 @@ public:
* true.
*/
int
XREMain::XRE_mainInit(const nsXREAppData* aAppData, bool* aExitFlag)
XREMain::XRE_mainInit(bool* aExitFlag)
{
if (!aExitFlag)
return 1;
@ -2929,8 +2929,7 @@ XREMain::XRE_mainInit(const nsXREAppData* aAppData, bool* aExitFlag)
return 1;
}
nsXREAppData* overrideAppData = const_cast<nsXREAppData*>(aAppData);
rv = XRE_ParseAppData(overrideLF, overrideAppData);
rv = XRE_ParseAppData(overrideLF, mAppData);
if (NS_FAILED(rv)) {
Output(true, "Couldn't read override.ini");
return 1;
@ -3925,7 +3924,7 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
// init
bool exit = false;
int result = XRE_mainInit(aAppData, &exit);
int result = XRE_mainInit(&exit);
if (result != 0 || exit)
return result;
@ -4120,7 +4119,7 @@ XRE_mainMetro(int argc, char* argv[], const nsXREAppData* aAppData)
// init
bool exit = false;
if (xreMainPtr->XRE_mainInit(aAppData, &exit) != 0 || exit)
if (xreMainPtr->XRE_mainInit(&exit) != 0 || exit)
return 1;
// Located in widget, will call back into XRE_metroStartup and