Changeset 4574
- Timestamp:
- 02/10/07 15:16:43 (2 years ago)
- Files:
-
- WiredClient/trunk/WCPreferences.h (modified) (1 diff)
- WiredClient/trunk/WCPreferences.m (modified) (5 diffs)
- WiredClient/trunk/WCSettings.m (modified) (1 diff)
- WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
WiredClient/trunk/WCPreferences.h
r4460 r4574 139 139 NSMutableDictionary *_toolbarItems; 140 140 int _selectedEvent; 141 BOOL _ passwordTouched;141 BOOL _bookmarkPasswordTouched; 142 142 143 143 NSTabViewItem *_selectedTabViewItem; WiredClient/trunk/WCPreferences.m
r4460 r4574 556 556 - (void)_unselectBookmark { 557 557 NSMutableDictionary *bookmark; 558 NSDictionary *oldBookmark; 558 559 NSString *password; 559 560 int row; … … 564 565 return; 565 566 566 bookmark = [[WCSettings bookmarkAtIndex:row] mutableCopy]; 567 oldBookmark = [[WCSettings bookmarkAtIndex:row] retain]; 568 bookmark = [oldBookmark mutableCopy]; 567 569 [bookmark setObject:[_bookmarksNameTextField stringValue] forKey:WCBookmarksName]; 568 570 [bookmark setObject:[_bookmarksAddressTextField stringValue] forKey:WCBookmarksAddress]; … … 578 580 } 579 581 580 if(_passwordTouched) { 582 if(![[oldBookmark objectForKey:WCBookmarksAddress] isEqualToString:[bookmark objectForKey:WCBookmarksAddress]] || 583 ![[oldBookmark objectForKey:WCBookmarksLogin] isEqualToString:[bookmark objectForKey:WCBookmarksLogin]]) { 584 password = [[WCKeychain keychain] passwordForBookmark:oldBookmark]; 585 586 if(password) { 587 [[WCKeychain keychain] deletePasswordForBookmark:oldBookmark]; 588 [[WCKeychain keychain] setPassword:password forBookmark:bookmark]; 589 } 590 } 591 592 if(_bookmarkPasswordTouched) { 581 593 password = [_bookmarksPasswordTextField stringValue]; 582 594 … … 588 600 } 589 601 590 _passwordTouched = NO; 591 } 592 602 _bookmarkPasswordTouched = NO; 603 } 604 605 [oldBookmark release]; 593 606 [bookmark release]; 594 607 } … … 865 878 } 866 879 else if(object == _bookmarksPasswordTextField) { 867 _ passwordTouched = YES;880 _bookmarkPasswordTouched = YES; 868 881 } 869 882 else if(object == _trackerBookmarksNameTextField) { WiredClient/trunk/WCSettings.m
r4460 r4574 71 71 [[WCKeychain keychain] setPassword:password forBookmark:newBookmark]; 72 72 73 [newBookmark setObject:@"" forKey:WCBookmarksPassword];73 [newBookmark removeObjectForKey:WCBookmarksPassword]; 74 74 } 75 75 WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj
r4462 r4574 420 420 A564522D0A360D0700ADF4F5 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 421 421 A56452300A360D0D00ADF4F5 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = German; path = German.lproj/Credits.rtf; sourceTree = "<group>"; }; 422 A56452330A360D1500ADF4F5 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/Localizable.strings; sourceTree = "<group>"; };422 A56452330A360D1500ADF4F5 /* German */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/Localizable.strings; sourceTree = "<group>"; }; 423 423 A56452360A360D2C00ADF4F5 /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = German.lproj/AccountEditor.nib; sourceTree = "<group>"; }; 424 424 A56452390A360D3200ADF4F5 /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = German.lproj/Accounts.nib; sourceTree = "<group>"; };
