Adium

Changeset 25601

Show
Ignore:
Timestamp:
11/20/2008 03:53:38 AM (2 months ago)
Author:
catfish_man
Message:

Fix more warnings, and almost certainly some bugs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r25564 r25601  
    168168 */ 
    169169@property (nonatomic, retain) NSAttributedString *message; 
    170  
     170@property (readonly, nonatomic) NSString *messageString; 
    171171/*!     @brief  Get an array of CSS class names with which this content should be displayed. 
    172172 * 

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

    r24898 r25601  
    154154 * It will likely no longer be necessary with the GSoC 2007 Applescripting changes.  I've removed it from the public API 
    155155 * but left it here for now. -eds 
     156 * 
     157 * Bonjour still uses this. If it doesn't work, we need to fix it or transition bonjour off of it. 
    156158 */ 
    157159- (NSString *)messageString 

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

    r25532 r25601  
    6464@property (readwrite, nonatomic) AIFileTransferStatus status; 
    6565 
     66- (void)setPercentDone:(NSNumber *)percent bytes:(NSNumber *)bytes; 
    6667- (void)setPercentDone:(float)inPercent bytesSent:(unsigned long long)inBytesSent; 
    6768@property (readonly, nonatomic) float percentDone; 
    6869@property (readonly, nonatomic) unsigned long long bytesSent; 
     70- (void)setSizeWithNumber:(NSNumber *)newSize; 
     71- (NSNumber *)sizeNumber; 
    6972 
    7073@property (readwrite, nonatomic, retain) id accountData; 

  • trunk/Plugins/Bonjour/AWBonjourAccount.h

    r25598 r25601  
    3232} 
    3333 
     34- (void)requestReceiveOfFileTransfer:(ESFileTransfer *)fileTransfer; 
     35 
    3436@end 

  • trunk/Plugins/Bonjour/AWBonjourAccount.m

    r25598 r25601  
    3030#import "AWEzvDefines.h" 
    3131#import "AWBonjourPlugin.h" 
     32#import "AWEzvSupportRoutines.h" 
    3233#import <Adium/AIContactControllerProtocol.h> 
    3334#import <Adium/AIContactObserverManager.h> 
    …… 
    4344#import <Adium/AIStatus.h> 
    4445#import <Adium/NDRunLoopMessenger.h> 
     46#import <Adium/ESFileTransfer.h> 
    4547#import <AIUtilities/AIMutableOwnerArray.h> 
    4648#import <AIUtilities/AIObjectAdditions.h> 
     49#import <AIUtilities/AIImageAdditions.h> 
    4750#import <Adium/AIFileTransferControllerProtocol.h> 
    4851 
    …… 
    5457        AIThreadPreparing = 0, 
    5558        AIThreadReady 
    56 }; 
     59} AIThreadState; 
    5760 
    5861#define AUTORELEASE_POOL_REFRESH        5.0 
    …… 
    189192        NSString        *contactName, *statusMessage; 
    190193        NSDate          *idleSinceDate; 
    191         NSImage         *contactImage; 
    192194         
    193195        listContact = [adium.contactController contactWithService:service 
    …… 
    592594{ 
    593595        ESFileTransfer *transfer = [ESFileTransfer existingFileTransferWithID: [fileTransfer uniqueID]]; 
    594         [[self libezvThreadProxy] transferCancelled:transfer]; 
     596        [[self libezvThreadProxy] transferCancelled:fileTransfer]; 
    595597        [self mainPerformSelector:@selector(mainThreadCancelFileTransferRemotely:) 
    596598                       withObject:transfer]; 
    …… 
    765767{ 
    766768        [[NSNotificationCenter defaultCenter] removeObserver:self 
    767                                                     selector:@selector(threadWillExit:)  
     769                                                                                                                                                                                                                                                                       name:NSThreadWillExitNotification 
    768770                                                      object:[inNotification object]]; 
    769771 

  • trunk/Plugins/Bonjour/libezv/Classes/AWEzv.h

    r25599 r25601  
    6666 
    6767- (void) startOutgoingFileTransfer:(EKEzvOutgoingFileTransfer *)transfer; 
     68- (void)transferCancelled:(EKEzvFileTransfer *)transfer; 
     69- (void) transferAccepted:(EKEzvFileTransfer *)transfer withFileName:(NSString *)fileName; 
    6870@end 
    6971