|
Lines 555-560
Link Here
|
| 555 |
rv = curProfileDir->Exists(&exists); |
555 |
rv = curProfileDir->Exists(&exists); |
| 556 |
if (NS_FAILED(rv) || !exists) |
556 |
if (NS_FAILED(rv) || !exists) |
| 557 |
profileURLStr = PROFILE_MANAGER_URL; |
557 |
profileURLStr = PROFILE_MANAGER_URL; |
|
|
558 |
#if 0 |
| 558 |
if (exists) |
559 |
if (exists) |
| 559 |
{ |
560 |
{ |
| 560 |
// If the profile is locked, we need the UI |
561 |
// If the profile is locked, we need the UI |
|
Lines 564-569
Link Here
|
| 564 |
if (NS_FAILED(rv)) |
565 |
if (NS_FAILED(rv)) |
| 565 |
profileURLStr = PROFILE_MANAGER_URL; |
566 |
profileURLStr = PROFILE_MANAGER_URL; |
| 566 |
} |
567 |
} |
|
|
568 |
#endif |
| 567 |
} |
569 |
} |
| 568 |
else |
570 |
else |
| 569 |
profileURLStr = PROFILE_SELECTION_URL; |
571 |
profileURLStr = PROFILE_SELECTION_URL; |
|
Lines 1200-1205
Link Here
|
| 1200 |
else |
1202 |
else |
| 1201 |
isSwitch = PR_FALSE; |
1203 |
isSwitch = PR_FALSE; |
| 1202 |
|
1204 |
|
|
|
1205 |
#if 0 |
| 1203 |
nsProfileLock localLock; |
1206 |
nsProfileLock localLock; |
| 1204 |
nsCOMPtr<nsILocalFile> localProfileDir(do_QueryInterface(profileDir, &rv)); |
1207 |
nsCOMPtr<nsILocalFile> localProfileDir(do_QueryInterface(profileDir, &rv)); |
| 1205 |
if (NS_FAILED(rv)) return rv; |
1208 |
if (NS_FAILED(rv)) return rv; |
|
Lines 1209-1214
Link Here
|
| 1209 |
NS_ERROR("Could not get profile directory lock."); |
1212 |
NS_ERROR("Could not get profile directory lock."); |
| 1210 |
return rv; |
1213 |
return rv; |
| 1211 |
} |
1214 |
} |
|
|
1215 |
#endif |
| 1212 |
|
1216 |
|
| 1213 |
nsCOMPtr<nsIObserverService> observerService = |
1217 |
nsCOMPtr<nsIObserverService> observerService = |
| 1214 |
do_GetService("@mozilla.org/observer-service;1", &rv); |
1218 |
do_GetService("@mozilla.org/observer-service;1", &rv); |
|
Lines 1244-1250
Link Here
|
| 1244 |
gProfileDataAccess->SetCurrentProfile(aCurrentProfile); |
1248 |
gProfileDataAccess->SetCurrentProfile(aCurrentProfile); |
| 1245 |
gProfileDataAccess->mProfileDataChanged = PR_TRUE; |
1249 |
gProfileDataAccess->mProfileDataChanged = PR_TRUE; |
| 1246 |
gProfileDataAccess->UpdateRegistry(nsnull); |
1250 |
gProfileDataAccess->UpdateRegistry(nsnull); |
|
|
1251 |
#if 0 |
| 1247 |
mCurrentProfileLock = localLock; |
1252 |
mCurrentProfileLock = localLock; |
|
|
1253 |
#endif |
| 1248 |
|
1254 |
|
| 1249 |
if (NS_FAILED(rv)) return rv; |
1255 |
if (NS_FAILED(rv)) return rv; |
| 1250 |
mCurrentProfileAvailable = PR_TRUE; |
1256 |
mCurrentProfileAvailable = PR_TRUE; |
|
Lines 1331-1337
Link Here
|
| 1331 |
UpdateCurrentProfileModTime(PR_TRUE); |
1337 |
UpdateCurrentProfileModTime(PR_TRUE); |
| 1332 |
mCurrentProfileAvailable = PR_FALSE; |
1338 |
mCurrentProfileAvailable = PR_FALSE; |
| 1333 |
mCurrentProfileName.Truncate(0); |
1339 |
mCurrentProfileName.Truncate(0); |
|
|
1340 |
#if 0 |
| 1334 |
mCurrentProfileLock.Unlock(); |
1341 |
mCurrentProfileLock.Unlock(); |
|
|
1342 |
#endif |
| 1335 |
|
1343 |
|
| 1336 |
return NS_OK; |
1344 |
return NS_OK; |
| 1337 |
} |
1345 |
} |