Adium

Changeset 24691

Show
Ignore:
Timestamp:
08/06/2008 07:50:30 PM (5 months ago)
Author:
catfish_man
Message:

Merge 64 bit branch to trunk. Fingers crossed, and I have been testing it some, but expect fallout from this. 11,000 line diffs are rarely without consequence ;)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:mergeinfo set to /branches/64bit:24581-24690

  • trunk/Adium.xcodeproj/project.pbxproj

    r24667 r24691  
    1254812548                        isa = XCBuildConfiguration; 
    1254912549                        buildSettings = { 
     12550                                ARCHS = "$(NATIVE_ARCH)"; 
    1255012551                                COPY_PHASE_STRIP = NO; 
    1255112552                                DEBUG_INFORMATION_FORMAT = dwarf; 
    …… 
    1257212573                                GCC_WARN_UNUSED_VARIABLE = YES; 
    1257312574                                HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; 
    12574                                 MACOSX_DEPLOYMENT_TARGET = 10.4; 
    1257512575                                ONLY_ACTIVE_ARCH = YES; 
    1257612576                                PREBINDING = NO; 
    …… 
    1257812578                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; 
    1257912579                                STRIP_INSTALLED_PRODUCT = NO; 
     12580                                VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64"; 
    1258012581                                WARNING_CFLAGS = "-Wall"; 
    1258112582                        }; 
    …… 
    1261512616                                PRECOMP_DESTINATION_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/PrefixHeaders"; 
    1261612617                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; 
     12618                                VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64"; 
    1261712619                                WARNING_CFLAGS = "-Wall"; 
    1261812620                        }; 
    …… 
    1265612658                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; 
    1265712659                                STRIP_INSTALLED_PRODUCT = NO; 
     12660                                VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64"; 
    1265812661                                WARNING_CFLAGS = "-Wall"; 
    1265912662                        }; 

  • trunk/Frameworks/Adium Framework/Source/AIAccountControllerProtocol.h

    r23929 r24691  
    151151- (void)addAccount:(AIAccount *)inAccount; 
    152152- (void)deleteAccount:(AIAccount *)inAccount; 
    153 - (int)moveAccount:(AIAccount *)account toIndex:(int)destIndex; 
     153- (NSUInteger)moveAccount:(AIAccount *)account toIndex:(NSUInteger)destIndex; 
    154154- (void)accountDidChangeUID:(AIAccount *)inAccount; 
    155155 

  • trunk/Frameworks/Adium Framework/Source/AIChatControllerProtocol.h

    r23581 r24691  
    3939- (NSSet *)openChats; 
    4040- (AIChat *)mostRecentUnviewedChat; 
    41 - (int)unviewedContentCount; 
    42 - (int)unviewedConversationCount; 
     41- (NSUInteger)unviewedContentCount; 
     42- (NSUInteger)unviewedConversationCount; 
    4343- (void)switchChat:(AIChat *)chat toAccount:(AIAccount *)newAccount; 
    4444- (void)switchChat:(AIChat *)chat toListContact:(AIListContact *)inContact usingContactAccount:(BOOL)useContactAccount; 

  • trunk/Frameworks/Adium Framework/Source/AIChat.m

    r24558 r24691  
    412412- (BOOL)shouldBeginSendingContentObject:(AIContentObject *)inObject 
    413413{ 
    414         int   currentIndex = [pendingOutgoingContentObjects indexOfObjectIdenticalTo:inObject]; 
     414        NSInteger     currentIndex = [pendingOutgoingContentObjects indexOfObjectIdenticalTo:inObject]; 
    415415 
    416416        //Don't add the object twice when we are called from -[AIChat finishedSendingContentObject] 
    …… 
    502502} 
    503503 
    504 - (unsigned)containedObjectsCount 
     504- (NSUInteger)containedObjectsCount 
    505505{ 
    506506        return [[self containedObjects] count]; 
    …… 
    512512} 
    513513 
    514 - (id)objectAtIndex:(unsigned)index 
     514- (id)objectAtIndex:(NSUInteger)index 
    515515{ 
    516516        return [[self containedObjects] objectAtIndex:index]; 
    517517} 
    518518 
    519 - (int)indexOfObject:(AIListObject *)inObject 
     519- (NSUInteger)indexOfObject:(AIListObject *)inObject 
    520520{ 
    521521    return [[self containedObjects] indexOfObject:inObject]; 

  • trunk/Frameworks/Adium Framework/Source/AIContactControllerProtocol.h

    r24332 r24691  
    130130- (void)removeListObjects:(NSArray *)objectArray; 
    131131- (void)requestAddContactWithUID:(NSString *)contactUID service:(AIService *)inService account:(AIAccount *)inAccount; 
    132 - (void)moveListObjects:(NSArray *)objectArray intoObject:(AIListObject<AIContainingObject> *)group index:(int)index; 
     132- (void)moveListObjects:(NSArray *)objectArray intoObject:(AIListObject<AIContainingObject> *)group index:(NSUInteger)index; 
    133133- (void)moveContact:(AIListContact *)listContact intoObject:(AIListObject<AIContainingObject> *)group; 
    134134- (void)_moveContactLocally:(AIListContact *)listContact toGroup:(AIListGroup *)group; 
    …… 
    147147- (void)removeDetachedContactList:(AIListGroup *)detachedList; 
    148148- (BOOL)isGroupDetached:(AIListObject *)group; 
    149 - (unsigned)contactListCount; 
     149- (NSUInteger)contactListCount; 
    150150 
    151151//Contact hiding 

  • trunk/Frameworks/Adium Framework/Source/AIContentControllerProtocol.h

    r24293 r24691  
    164164 * @result A float between 0.0 and 1.0, with (HIGHEST_FILTER_PRIORITY == 0.0) and (LOWEST_FILTER_PRIORITY == 1.0) 
    165165 */ 
    166 - (float)filterPriority; 
     166- (CGFloat)filterPriority; 
    167167@end 
    168168 
    …… 
    197197 * @result A float between 0.0 and 1.0, with (HIGHEST_FILTER_PRIORITY == 0.0) and (LOWEST_FILTER_PRIORITY == 1.0) 
    198198 */ 
    199 - (float)filterPriority; 
     199- (CGFloat)filterPriority; 
    200200@end 
    201201 
    …… 
    238238 * @result A float between 0.0 and 1.0, with (HIGHEST_FILTER_PRIORITY == 0.0) and (LOWEST_FILTER_PRIORITY == 1.0) 
    239239 */ 
    240 - (float)filterPriority; 
     240- (CGFloat)filterPriority; 
    241241@end 
    242242 

  • trunk/Frameworks/Adium Framework/Source/AIDockControllerProtocol.h

    r17127 r24691  
    3535- (void)removeIconStateNamed:(NSString *)inName; 
    3636- (void)setIconState:(AIIconState *)iconState named:(NSString *)inName; 
    37 - (float)dockIconScale; 
     37- (CGFloat)dockIconScale; 
    3838- (NSImage *)baseApplicationIconImage; 
    3939 

  • trunk/Frameworks/Adium Framework/Source/AIEmoticonControllerProtocol.h

    r17127 r24691  
    2222- (NSArray *)activeEmoticons; 
    2323- (NSArray *)activeEmoticonPacks; 
    24 - (void)moveEmoticonPacks:(NSArray *)inPacks toIndex:(int)index; 
     24- (void)moveEmoticonPacks:(NSArray *)inPacks toIndex:(NSUInteger)index; 
    2525- (void)setEmoticonPack:(AIEmoticonPack *)inPack enabled:(BOOL)enabled; 
    2626- (void)setEmoticon:(AIEmoticon *)inEmoticon inPack:(AIEmoticonPack *)inPack enabled:(BOOL)enabled; 

  • trunk/Frameworks/Adium Framework/Source/AIFileTransferControllerProtocol.h

    r17127 r24691  
    5353- (NSArray *)fileTransferArray; 
    5454 
    55 - (int)activeTransferCount; 
     55- (NSUInteger)activeTransferCount; 
    5656 
    5757- (void)receiveRequestForFileTransfer:(ESFileTransfer *)fileTransfer; 

  • trunk/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h

    r24558 r24691  
    134134 * @param index The index within that containter window. 
    135135 */ 
    136 - (id)openChat:(AIChat *)inChat inContainerWithID:(NSString *)containerID atIndex:(int)index; 
     136- (id)openChat:(AIChat *)inChat inContainerWithID:(NSString *)containerID atIndex:(NSUInteger)index; 
    137137 
    138138/*! 
    …… 
    463463- (void)openInterface; 
    464464- (void)closeInterface; 
    465 - (id)openChat:(AIChat *)chat inContainerWithID:(NSString *)containerID withName:(NSString *)containerName atIndex:(int)index; 
     465- (id)openChat:(AIChat *)chat inContainerWithID:(NSString *)containerID withName:(NSString *)containerName atIndex:(NSUInteger)index; 
    466466- (void)setActiveChat:(AIChat *)inChat; 
    467 - (void)moveChat:(AIChat *)chat toContainerWithID:(NSString *)containerID index:(int)index; 
     467- (void)moveChat:(AIChat *)chat toContainerWithID:(NSString *)containerID index:(NSUInteger)index; 
    468468- (void)moveChatToNewContainer:(AIChat *)inChat; 
    469469- (void)closeChat:(AIChat *)chat; 
    …… 
    555555- (void)nextDetachedContactList; 
    556556- (void)previousDetachedContactList; 
    557 - (unsigned)detachedContactListCount; 
     557- (NSUInteger)detachedContactListCount; 
    558558@end 
    559559 

  • trunk/Frameworks/Adium Framework/Source/AIListGroupCell.m

    r24326 r24691  
    322322- (void)drawBackgroundGradientInRect:(NSRect)inRect 
    323323{ 
    324         float backgroundL; 
    325         float gradientL; 
     324        CGFloat backgroundL; 
     325        CGFloat gradientL; 
    326326         
    327327        //Gradient 

  • trunk/Frameworks/Adium Framework/Source/AIListGroup.m

    r24446 r24691  
    132132 
    133133//Number of containd objects 
    134 - (unsigned)containedObjectsCount 
     134- (NSUInteger)containedObjectsCount 
    135135{ 
    136136    return [containedObjects count]; 
    …… 
    152152 
    153153//Retrieve an object by index 
    154 - (id)objectAtIndex:(unsigned)index 
     154- (id)objectAtIndex:(NSUInteger)index 
    155155{ 
    156156    return [containedObjects objectAtIndex:index]; 
    …… 
    158158 
    159159//Retrieve the index of an object 
    160 - (int)indexOfObject:(AIListObject *)inObject 
     160- (NSUInteger)indexOfObject:(AIListObject *)inObject 
    161161{ 
    162162    return [containedObjects indexOfObject:inObject]; 

  • trunk/Frameworks/Adium Framework/Source/AIListObject.h

    r24330 r24691  
    3434@protocol AIContainingObject <NSObject> 
    3535- (NSArray *)containedObjects; 
    36 - (unsigned)containedObjectsCount; 
     36- (NSUInteger)containedObjectsCount; 
    3737- (BOOL)containsObject:(AIListObject *)inObject; 
    3838 
    3939- (NSString *)contentsBasedIdentifier; 
    4040 
    41 - (id)objectAtIndex:(unsigned)index; 
    42 - (int)indexOfObject:(AIListObject *)inObject; 
     41- (id)objectAtIndex:(NSUInteger)index; 
     42- (NSUInteger)indexOfObject:(AIListObject *)inObject; 
    4343- (AIListObject *)objectWithService:(AIService *)inService UID:(NSString *)inUID;