wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug https://bugzilla.mozilla.org/show_bug.cgi?id=408490

Browse Source
This commit is contained in:
romashin 2008-04-19 18:37:06 +03:00
parent dd670e1801
commit 6289fa5a02
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
embedding/browser/qt/src/qgeckoglobals.cpp
View File

@ -188,6 +188,12 @@ QGeckoGlobals::pushStartup()
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return; return;
if (sProfileDir && !sProfileLock) {
rv = XRE_LockProfileDirectory(sProfileDir,
&sProfileLock);
if (NS_FAILED(rv)) return;
}
rv = XRE_InitEmbedding(greDir, binDir, rv = XRE_InitEmbedding(greDir, binDir,
const_cast<QTEmbedDirectoryProvider*> const_cast<QTEmbedDirectoryProvider*>
(&kDirectoryProvider), (&kDirectoryProvider),
@ -196,12 +202,6 @@ QGeckoGlobals::pushStartup()
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return; return;
// we no longer need a reference to the DirectoryServiceProvider
if (sAppFileLocProvider) {
NS_RELEASE(sAppFileLocProvider);
sAppFileLocProvider = nsnull;
}
if (sProfileDir) if (sProfileDir)
XRE_NotifyProfile(); XRE_NotifyProfile();
@ -215,8 +215,18 @@ QGeckoGlobals::popStartup()
{ {
sWidgetCount--; sWidgetCount--;
if (sWidgetCount == 0) { if (sWidgetCount == 0) {
// we no longer need a reference to the DirectoryServiceProvider
if (sAppFileLocProvider) {
NS_RELEASE(sAppFileLocProvider);
sAppFileLocProvider = nsnull;
}
// shut down XPCOM/Embedding // shut down XPCOM/Embedding
XRE_TermEmbedding(); XRE_TermEmbedding();
NS_IF_RELEASE(sProfileLock);
NS_IF_RELEASE(sProfileDir);
} }
} }
@ -264,16 +274,27 @@ QGeckoGlobals::setProfilePath(const char *aDir, const char *aName)
nsresult rv = nsresult rv =
NS_NewNativeLocalFile(nsDependentCString(aDir), PR_TRUE, &sProfileDir); NS_NewNativeLocalFile(nsDependentCString(aDir), PR_TRUE, &sProfileDir);
if (NS_SUCCEEDED(rv) && aName)
rv = sProfileDir->AppendNative(nsDependentCString(aName));
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
PRBool exists = PR_FALSE;
rv = sProfileDir->Exists(&exists);
if (!exists)
rv = sProfileDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
rv = XRE_LockProfileDirectory(sProfileDir, &sProfileLock); rv = XRE_LockProfileDirectory(sProfileDir, &sProfileLock);
if (NS_SUCCEEDED(rv)) { }
if (sWidgetCount)
XRE_NotifyProfile(); if (NS_SUCCEEDED(rv)) {
return; if (sWidgetCount)
} XRE_NotifyProfile();
return;
} }
NS_WARNING("Failed to lock profile."); NS_WARNING("Failed to lock profile.");
// Failed // Failed
NS_IF_RELEASE(sProfileDir); NS_IF_RELEASE(sProfileDir);
NS_IF_RELEASE(sProfileLock); NS_IF_RELEASE(sProfileLock);