Changeset 6202
- Timestamp:
- Jun 16, 2008, 6:31:44 PM (14 years ago)
- Location:
- trunk/macosx
- Files:
-
- 2 edited
-
English.lproj/InfoWindow.xib (modified) (14 diffs)
-
PrefsController.m (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/English.lproj/InfoWindow.xib
r6088 r6202 4 4 <int key="IBDocument.SystemTarget">1050</int> 5 5 <string key="IBDocument.SystemVersion">9D34</string> 6 <string key="IBDocument.InterfaceBuilderVersion">6 67</string>6 <string key="IBDocument.InterfaceBuilderVersion">670</string> 7 7 <string key="IBDocument.AppKitVersion">949.33</string> 8 8 <string key="IBDocument.HIToolboxVersion">352.00</string> 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value="1 770"/>11 <integer value="1066"/> 12 12 </object> 13 13 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 2223 2223 </object> 2224 2224 <object class="NSCustomView" id="180459949"> 2225 < referencekey="NSNextResponder"/>2225 <nil key="NSNextResponder"/> 2226 2226 <int key="NSvFlags">274</int> 2227 2227 <object class="NSMutableArray" key="NSSubviews"> … … 3864 3864 <string key="NSFrame">{{1, 17}, {338, 172}}</string> 3865 3865 <reference key="NSSuperview" ref="1009918777"/> 3866 <reference key="NSNextKeyView" ref="221969066"/>3867 3866 <reference key="NSDocView" ref="221969066"/> 3868 3867 <reference key="NSBGColor" ref="987864771"/> … … 3898 3897 <string key="NSFrame">{{1, 0}, {338, 17}}</string> 3899 3898 <reference key="NSSuperview" ref="1009918777"/> 3900 <reference key="NSNextKeyView" ref="1053875789"/>3901 3899 <reference key="NSDocView" ref="1053875789"/> 3902 3900 <reference key="NSBGColor" ref="987864771"/> … … 3907 3905 <string key="NSFrame">{{10, 77}, {340, 190}}</string> 3908 3906 <reference key="NSSuperview" ref="180459949"/> 3909 <reference key="NSNextKeyView" ref="386870512"/>3910 3907 <int key="NSsFlags">562</int> 3911 3908 <reference key="NSVScroller" ref="70145897"/> … … 4025 4022 <string key="NSFrame">{{1, 17}, {338, 48}}</string> 4026 4023 <reference key="NSSuperview" ref="252354812"/> 4027 <reference key="NSNextKeyView" ref="705721384"/>4028 4024 <reference key="NSDocView" ref="705721384"/> 4029 4025 <reference key="NSBGColor" ref="987864771"/> … … 4059 4055 <string key="NSFrame">{{1, 0}, {338, 17}}</string> 4060 4056 <reference key="NSSuperview" ref="252354812"/> 4061 <reference key="NSNextKeyView" ref="842629001"/>4062 4057 <reference key="NSDocView" ref="842629001"/> 4063 4058 <reference key="NSBGColor" ref="987864771"/> … … 4068 4063 <string key="NSFrame">{{10, 271}, {340, 66}}</string> 4069 4064 <reference key="NSSuperview" ref="180459949"/> 4070 <reference key="NSNextKeyView" ref="230403242"/>4071 4065 <int key="NSsFlags">562</int> 4072 4066 <reference key="NSVScroller" ref="58257122"/> … … 4294 4288 </object> 4295 4289 <string key="NSFrameSize">{360, 342}</string> 4296 <reference key="NSSuperview"/>4297 4290 <string key="NSClassName">NSView</string> 4298 4291 <string key="NSExtension">NSResponder</string> … … 4497 4490 </object> 4498 4491 <object class="NSCustomView" id="1005910882"> 4499 < nilkey="NSNextResponder"/>4492 <reference key="NSNextResponder"/> 4500 4493 <int key="NSvFlags">258</int> 4501 4494 <object class="NSMutableArray" key="NSSubviews"> … … 4704 4697 <object class="NSPopUpButtonCell" key="NSCell" id="271393508"> 4705 4698 <int key="NSCellFlags">-2076049856</int> 4706 <int key="NSCellFlags2">13 4350848</int>4699 <int key="NSCellFlags2">133120</int> 4707 4700 <reference key="NSSupport" ref="26"/> 4708 4701 <reference key="NSControlView" ref="307561255"/> … … 4876 4869 <object class="NSPopUpButtonCell" key="NSCell" id="646947417"> 4877 4870 <int key="NSCellFlags">-2076049856</int> 4878 <int key="NSCellFlags2">13 4350848</int>4871 <int key="NSCellFlags2">133120</int> 4879 4872 <reference key="NSSupport" ref="26"/> 4880 4873 <reference key="NSControlView" ref="188523528"/> … … 4962 4955 <object class="NSPopUpButtonCell" key="NSCell" id="380288231"> 4963 4956 <int key="NSCellFlags">-2076049856</int> 4964 <int key="NSCellFlags2">13 4350848</int>4957 <int key="NSCellFlags2">133120</int> 4965 4958 <reference key="NSSupport" ref="26"/> 4966 4959 <reference key="NSControlView" ref="535987563"/> … … 5152 5145 </object> 5153 5146 <string key="NSFrameSize">{351, 161}</string> 5147 <reference key="NSSuperview"/> 5154 5148 <object class="NSMutableString" key="NSClassName"> 5155 5149 <characters key="NS.bytes">NSView</characters> -
trunk/macosx/PrefsController.m
r6198 r6202 65 65 - (void) importFolderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info; 66 66 67 - (void) setKeychainPassword: ( NSString*) password forService: (const char *) service username: (const char *) username;67 - (void) setKeychainPassword: (const char *) password forService: (const char *) service username: (const char *) username; 68 68 69 69 @end … … 768 768 - (void) setProxyPassword: (id) sender 769 769 { 770 NSString * password = [sender stringValue];770 const char * password = [[sender stringValue] UTF8String]; 771 771 [self setKeychainPassword: password forService: PROXY_KEYCHAIN_SERVICE username: PROXY_KEYCHAIN_NAME]; 772 772 773 tr_sessionSetProxyPassword(fHandle, [password UTF8String]);773 tr_sessionSetProxyPassword(fHandle, password); 774 774 } 775 775 … … 810 810 - (void) setRPCPassword: (id) sender 811 811 { 812 NSString * password = [sender stringValue];812 const char * password = [[sender stringValue] UTF8String]; 813 813 [self setKeychainPassword: password forService: RPC_KEYCHAIN_SERVICE username: RPC_KEYCHAIN_NAME]; 814 814 815 tr_sessionSetRPCPassword(fHandle, [password UTF8String]);815 tr_sessionSetRPCPassword(fHandle, password); 816 816 } 817 817 … … 1159 1159 } 1160 1160 1161 - (void) setKeychainPassword: ( NSString*) password forService: (const char *) service username: (const char *) username1161 - (void) setKeychainPassword: (const char *) password forService: (const char *) service username: (const char *) username 1162 1162 { 1163 1163 SecKeychainItemRef item = NULL; 1164 BOOL shouldAdd = password && ![password isEqualToString: @""];1164 NSUInteger passwordLength = strlen(password) > 0; 1165 1165 1166 1166 OSStatus result = SecKeychainFindGenericPassword(NULL, strlen(service), service, strlen(username), username, NULL, NULL, &item); 1167 1167 if (result == noErr && item) 1168 1168 { 1169 if ( shouldAdd) //found, so update1169 if (passwordLength > 0) //found, so update 1170 1170 { 1171 result = SecKeychainItemModifyAttributesAndData(item, NULL, [password length], (const void *)[password UTF8String]);1171 result = SecKeychainItemModifyAttributesAndData(item, NULL, passwordLength, (const void *)password); 1172 1172 if (result != noErr) 1173 1173 NSLog(@"Problem updating Keychain item: %s", GetMacOSStatusErrorString(result)); … … 1182 1182 else if (result == errSecItemNotFound) //not found, so add 1183 1183 { 1184 if ( shouldAdd)1184 if (passwordLength > 0) 1185 1185 { 1186 1186 result = SecKeychainAddGenericPassword(NULL, strlen(service), service, strlen(username), username, 1187 [password length], (const void *)[password UTF8String], NULL);1187 passwordLength, (const void *)password, NULL); 1188 1188 if (result != noErr) 1189 1189 NSLog(@"Problem adding Keychain item: %s", GetMacOSStatusErrorString(result));
Note: See TracChangeset
for help on using the changeset viewer.
