зеркало из https://github.com/mozilla/gecko-dev.git
fixes needing profile manager to use psm. bug 56161. r=javi, sr=mscott
This commit is contained in:
Родитель
69e9080908
Коммит
01f9a0a0b5
|
@ -568,9 +568,6 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval )
|
|||
nsCOMPtr<nsIFile> profileSpec;
|
||||
nsXPIDLCString profilePath;
|
||||
|
||||
NS_WITH_SERVICE(nsIProfile, profile, kProfileCID, &rv);
|
||||
if (NS_FAILED(rv)) goto failure;
|
||||
|
||||
rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileSpec));
|
||||
if (NS_FAILED(rv)) goto failure;
|
||||
|
||||
|
@ -580,8 +577,12 @@ nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval )
|
|||
profileSpec->Create(nsIFile::DIRECTORY_TYPE, 0);
|
||||
#endif
|
||||
|
||||
NS_WITH_SERVICE(nsIProfile, profile, kProfileCID, &rv);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
rv = profile->GetCurrentProfile(getter_Copies(profileName));
|
||||
if (NS_FAILED(rv)) goto failure;
|
||||
}
|
||||
|
||||
CMTStatus psmStatus;
|
||||
nsCAutoString profilenameC;
|
||||
|
|
Загрузка…
Ссылка в новой задаче