Changeset 25598
- Timestamp:
- 11/20/2008 03:12:40 AM (2 months ago)
- Files:
-
- trunk/Adium.xcodeproj/project.pbxproj (modified) (6 diffs)
- trunk/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m (modified) (1 diff)
- trunk/Plugins/Bonjour/AWBonjourAccount.h (modified) (1 diff)
- trunk/Plugins/Bonjour/AWBonjourAccount.m (modified) (1 diff)
- trunk/Plugins/Bonjour/libezv/Classes/AWEzvContact.m (modified) (1 diff)
- trunk/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m (modified) (6 diffs)
- trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m (modified) (1 diff)
- trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.m (modified) (1 diff)
- trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m (modified) (1 diff)
- trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactPrivate.m (modified) (1 diff)
- trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m (modified) (1 diff)
- trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Adium.xcodeproj/project.pbxproj
r25594 r25598 11989 11989 GCC_PRECOMPILE_PREFIX_HEADER = YES; 11990 11990 GCC_PREFIX_HEADER = Adium.pch; 11991 GCC_PREPROCESSOR_DEFINITIONS = ( 11992 ENABLE_NLS, 11993 DEBUG_BUILD, 11994 ); 11991 GCC_PREPROCESSOR_DEFINITIONS = ENABLE_NLS; 11995 11992 HEADER_SEARCH_PATHS = ( 11996 11993 "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", … … 12030 12027 GCC_PRECOMPILE_PREFIX_HEADER = YES; 12031 12028 GCC_PREFIX_HEADER = Adium.pch; 12032 GCC_PREPROCESSOR_DEFINITIONS = ( 12033 ENABLE_NLS, 12034 CRASH_REPORTER, 12035 ); 12029 GCC_PREPROCESSOR_DEFINITIONS = ENABLE_NLS; 12036 12030 HEADER_SEARCH_PATHS = ( 12037 12031 "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", … … 12071 12065 GCC_PRECOMPILE_PREFIX_HEADER = YES; 12072 12066 GCC_PREFIX_HEADER = Adium.pch; 12073 GCC_PREPROCESSOR_DEFINITIONS = ( 12074 ENABLE_NLS, 12075 CRASH_REPORTER, 12076 DEBUG_BUILD, 12077 ); 12067 GCC_PREPROCESSOR_DEFINITIONS = ENABLE_NLS; 12078 12068 HEADER_SEARCH_PATHS = ( 12079 12069 "$(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", … … 12105 12095 isa = XCBuildConfiguration; 12106 12096 buildSettings = { 12107 GCC_PREPROCESSOR_DEFINITIONS = ( 12108 DEBUG_BUILD, 12109 HAVE_EXPAT_CONFIG_H, 12110 ); 12111 GCC_WARN_INHIBIT_ALL_WARNINGS = YES; 12097 GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = HAVE_EXPAT_CONFIG_H; 12112 12098 INFOPLIST_FILE = Plists/Bonjour.plist; 12113 12099 PRODUCT_NAME = Bonjour; … … 12119 12105 isa = XCBuildConfiguration; 12120 12106 buildSettings = { 12121 GCC_PREPROCESSOR_DEFINITIONS = HAVE_EXPAT_CONFIG_H; 12122 GCC_WARN_INHIBIT_ALL_WARNINGS = YES; 12107 GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = HAVE_EXPAT_CONFIG_H; 12123 12108 INFOPLIST_FILE = Plists/Bonjour.plist; 12124 12109 PRODUCT_NAME = Bonjour; … … 12130 12115 isa = XCBuildConfiguration; 12131 12116 buildSettings = { 12132 GCC_PREPROCESSOR_DEFINITIONS = ( 12133 DEBUG_BUILD, 12134 HAVE_EXPAT_CONFIG_H, 12135 ); 12136 GCC_WARN_INHIBIT_ALL_WARNINGS = YES; 12117 GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = HAVE_EXPAT_CONFIG_H; 12137 12118 INFOPLIST_FILE = Plists/Bonjour.plist; 12138 12119 PRODUCT_NAME = Bonjour; trunk/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
r25520 r25598 17 17 #import <Adium/AIChat.h> 18 18 #import <Adium/AIAccount.h> 19 #import <Adium/AIListObject.h> 19 20 #import <Adium/AIMessageEntryTextView.h> 20 21 #import <Adium/AIPreferenceControllerProtocol.h> trunk/Plugins/Bonjour/AWBonjourAccount.h
r20892 r25598 24 24 25 25 #import <Adium/AIAccount.h> 26 27 @protocol AWEzvClientProtocol; 28 @class AWEzv; 26 #import "AWEzv.h" 29 27 30 28 @interface AWBonjourAccount : AIAccount <AWEzvClientProtocol, AIAccount_Files> { trunk/Plugins/Bonjour/AWBonjourAccount.m
r25443 r25598 37 37 #import <Adium/AIChat.h> 38 38 #import <Adium/AIContentMessage.h> 39 #import <Adium/AIContentObject.h> 39 40 #import <Adium/AIContentTyping.h> 40 41 #import <Adium/AIHTMLDecoder.h> trunk/Plugins/Bonjour/libezv/Classes/AWEzvContact.m
r22154 r25598 37 37 #import "AWEzvXMLStream.h" 38 38 #import "AWEzvRendezvousData.h" 39 #import "AWEzvContactManager.h" 40 #import "AWEzv.h" 41 #import "EKEzvFileTransfer.h" 42 39 43 #include "sha1.h" 40 44 trunk/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m
r24774 r25598 8 8 9 9 #import "EKEzvOutgoingFileTransfer.h" 10 10 #import "AWEzv.h" 11 #import "AWEzvContactManager.h" 11 12 12 13 #define APPLE_SINGLE_HEADER_LENGTH 26 … … 171 172 /* Now we need to get the NSData for each item in the directory */ 172 173 NSFileManager *fileManager = [NSFileManager defaultManager]; 173 NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtPath:[self localFilename]];174 NSString *file;175 174 NSString *basePath = [[self localFilename] stringByAppendingString:@"/"]; 176 while (file = [enumerator nextObject]) { 175 176 for (NSString *file in [fileManager enumeratorAtPath:[self localFilename]]) { 177 177 NSString *fullPath = [basePath stringByAppendingString:file]; 178 178 … … 270 270 NSMutableArray *children = [NSMutableArray arrayWithCapacity:10]; 271 271 NSFileManager *fileManager = [NSFileManager defaultManager]; 272 NSEnumerator *enumerator = [[fileManager directoryContentsAtPath:basePath] objectEnumerator]; 273 274 NSString *file; 275 while (file = [enumerator nextObject]) { 272 273 for (NSString *file in [fileManager directoryContentsAtPath:basePath]){ 276 274 NSString *newPath = [basePath stringByAppendingPathComponent:file]; 277 boolexists = NO;278 booldirectory = NO;275 BOOL exists = NO; 276 BOOL directory = NO; 279 277 exists = [fileManager fileExistsAtPath:newPath isDirectory:&directory]; 280 278 if (!exists) { … … 299 297 NSArray *dirChildren = [self generateXMLFromDirectory:newPath]; 300 298 301 NSEnumerator *dirEnumerator = [dirChildren objectEnumerator]; 302 NSXMLElement *child; 303 while (child = [dirEnumerator nextObject]) { 299 for (NSXMLElement *child in dirChildren) { 304 300 [directory addChild:child]; 305 301 } … … 319 315 } 320 316 NSString *sizeString = [self sizeForPath:newPath]; 321 if (size != nil) {317 if (size != 0) { 322 318 [fileXML addAttribute:[NSXMLNode attributeWithName:@"size" stringValue:sizeString]]; 323 319 } … … 407 403 FSCatalogInfo catalogInfo; 408 404 OSStatus err; 409 B OOLitemIsDirectory = NO;405 Boolean itemIsDirectory = NO; 410 406 err = FSPathMakeRef((const UInt8 *)[filePath fileSystemRepresentation], &ref, &itemIsDirectory); 411 407 if (err != noErr) { trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m
r25597 r25598 35 35 #import "AWEzvContactPrivate.h" 36 36 #import "AWEzvXMLStream.h" 37 #import "AWEzv.h" 37 38 38 39 /* socket functions */ trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.m
r21782 r25598 33 33 #import "AWEzvContactManager.h" 34 34 #import "AWEzvContactPrivate.h" 35 #import "AWEzvXMLStream.h" 35 36 36 37 @implementation AWEzvContactManager trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m
r25424 r25598 171 171 CFRelease(uuid); 172 172 } 173 avInstanceName = [NSString stringWithFormat:@"%@@%@", (consoleUser ? consoleUser : @""), (computerName ?computerName : @"")];173 avInstanceName = [NSString stringWithFormat:@"%@@%@", (consoleUser ? (NSString *)consoleUser : @""), (computerName ? (NSString *)computerName : @"")]; 174 174 if (consoleUser) CFRelease(consoleUser); 175 175 if (computerName) CFRelease(computerName); trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvContactPrivate.m
r22154 r25598 39 39 #import "AWEzvSupportRoutines.h" 40 40 #import "EKEzvFileTransfer.h" 41 #import "AWEzvContactManagerRendezvous.h" 42 #import "EKEzvIncomingFileTransfer.h" 41 43 42 44 #include <sys/types.h> trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m
r24774 r25598 486 486 TXTRecordRef txtRecord; 487 487 DNSServiceErrorType txtRecordError; 488 NSString *key;489 NSEnumerator *enumerator;490 488 id value; 491 idvalueToSet;489 char *valueToSet; 492 490 uint8_t valueSize; 493 491 TXTRecordCreate(/* TXTRecordRef */ &txtRecord, /* buffer length */ 0, /* buffer */ NULL); 494 492 495 493 /* Enumerate through keys setting the txtrecordvalue */ 496 enumerator = [keys keyEnumerator]; 497 498 while (key = [enumerator nextObject]) { 499 494 for (NSString *key in [keys keyEnumerator]) { 500 495 value = [keys objectForKey:key]; 501 496 //AWEzvLog(@"key=%@ value=%@", key, value); trunk/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m
r24783 r25598 35 35 #import "AWEzvXMLNode.h" 36 36 #import "AWEzvStack.h" 37 37 #import <AIUtilities/AIStringAdditions.h> 38 38 #import "AWEzvSupportRoutines.h" 39 39