Revision fb27f368 pithos-macos/PithosPreferencesController.m
| b/pithos-macos/PithosPreferencesController.m | ||
|---|---|---|
| 2 | 2 |
// PithosPreferencesController.m |
| 3 | 3 |
// pithos-macos |
| 4 | 4 |
// |
| 5 |
// Copyright 2011-2012 GRNET S.A. All rights reserved.
|
|
| 5 |
// Copyright 2011-2013 GRNET S.A. All rights reserved.
|
|
| 6 | 6 |
// |
| 7 | 7 |
// Redistribution and use in source and binary forms, with or |
| 8 | 8 |
// without modification, are permitted provided that the following |
| ... | ... | |
| 332 | 332 |
return; |
| 333 | 333 |
} else {
|
| 334 | 334 |
[tmpPithosAccount updateServicesFromServiceCatalogRequest:serviceCatalogRequest]; |
| 335 |
self.authURLString = tmpPithosAccount.authURLString; |
|
| 335 | 336 |
self.manual = tmpPithosAccount.manual; |
| 336 | 337 |
self.pithosObjectStoreURLString = tmpPithosAccount.pithosObjectStoreURLString; |
| 337 | 338 |
self.astakosAccountURLString = tmpPithosAccount.astakosAccountURLString; |
| ... | ... | |
| 366 | 367 |
return; |
| 367 | 368 |
} else {
|
| 368 | 369 |
[tmpPithosAccount updateServicesFromServiceCatalogRequest:serviceCatalogRequest]; |
| 370 |
self.authURLString = tmpPithosAccount.authURLString; |
|
| 369 | 371 |
self.manual = tmpPithosAccount.manual; |
| 370 | 372 |
self.pithosObjectStoreURLString = tmpPithosAccount.pithosObjectStoreURLString; |
| 371 | 373 |
self.astakosAccountURLString = tmpPithosAccount.astakosAccountURLString; |
| ... | ... | |
| 407 | 409 |
authToken:authToken |
| 408 | 410 |
authUser:authUser |
| 409 | 411 |
ignoreSSLErrors:ignoreSSLErrors]; |
| 412 |
self.pithosObjectStoreURLString = selectedPithosAccount.pithosObjectStoreURLString; |
|
| 413 |
self.astakosAccountURLString = selectedPithosAccount.astakosAccountURLString; |
|
| 414 |
self.astakosWebloginURLString = selectedPithosAccount.astakosWebloginURLString; |
|
| 410 | 415 |
self.displayname = [selectedPithosAccount displaynameForUUID:authUser safe:NO]; |
| 411 | 416 |
[self updateAuthorization]; |
| 412 | 417 |
} |
| ... | ... | |
| 418 | 423 |
[delegate showPithosBrowser:self]; |
| 419 | 424 |
} |
| 420 | 425 |
if ([selectedPithosAccount isEqualTo:delegate.currentPithosAccount]) |
| 421 |
delegate.pithosBrowserController.pithos = selectedPithosAccount.pithos;
|
|
| 426 |
delegate.pithosBrowserController.pithosAccountManager = selectedPithosAccount;
|
|
| 422 | 427 |
} |
| 423 | 428 |
|
| 424 | 429 |
- (IBAction)authorizationCancel:(id)server {
|
Also available in: Unified diff