adium 6017:489d1e762237: Compilation and warning fixes

[com...@adium.im]

details: http://hg.adium.im/adium/rev/489d1e762237
revision: 6017:489d1e762237
branch: adium-1.5.11
author: Evan Schoenberg
date: Thu Nov 14 22:19:56 2019 -0500

Compilation and warning fixes

diffs (484 lines):

diff -r 325e2ab3406f -r 489d1e762237 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Thu Nov 14 22:19:56 2019 -0500
@@ -19,7 +19,6 @@
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode tag:(NSInteger)tag;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode representedObject:(id)object;
-- (void)removeAllItems;
- (void)removeAllItemsButFirst;
- (void)removeAllItemsAfterIndex:(NSInteger)idx;

diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIAbstractListController.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.m Thu Nov 14 22:19:56 2019 -0500
@@ -708,7 +708,7 @@
{
BOOL isGroup = [listObject isKindOfClass:[AIListGroup class]];

- NSMutableArray *locationsArray = [NSArray arrayWithObjects:
+ NSArray *locationsArray = [NSArray arrayWithObjects:
[NSNumber numberWithInt:(isGroup ? Context_Group_Manage : Context_Contact_Manage)],
[NSNumber numberWithInt:(isGroup ? Context_Group_AttachDetach : Context_Contact_AttachDetach)],
[NSNumber numberWithInt:Context_Contact_Action],
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m
--- a/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Thu Nov 14 22:19:56 2019 -0500
@@ -203,7 +203,8 @@

- (void)controlTextDidChange:(NSNotification *)aNotification
{
- if (!aNotification || [aNotification object] == textField_handle) {
+ if ([aNotification object] == nil ||
+ [aNotification object] == textField_handle) {
[button_okay setEnabled:([[textField_handle stringValue] length] > 0)];
}

diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIListCell.h
--- a/Frameworks/Adium Framework/Source/AIListCell.h Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListCell.h Thu Nov 14 22:19:56 2019 -0500
@@ -55,7 +55,6 @@
@property (readwrite, assign, nonatomic) AIListOutlineView *outlineControlView;

//Display options
-@property (readwrite, retain, nonatomic) NSFont *font;
@property (readwrite, nonatomic) NSTextAlignment textAlignment;
@property (readwrite, retain, nonatomic) NSColor *textColor;
@property (readwrite, retain, nonatomic) NSColor *invertedTextColor;
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIListContactBubbleCell.m
--- a/Frameworks/Adium Framework/Source/AIListContactBubbleCell.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListContactBubbleCell.m Thu Nov 14 22:19:56 2019 -0500
@@ -111,7 +111,7 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = highlightColor
? [[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease]
: [NSGradient selectedControlGradient];
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIListContactMockieCell.m
--- a/Frameworks/Adium Framework/Source/AIListContactMockieCell.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListContactMockieCell.m Thu Nov 14 22:19:56 2019 -0500
@@ -53,8 +53,8 @@
- (NSBezierPath *)bezierPathForDrawingInRect:(NSRect)rect
{
NSBezierPath *bezierPath;
- NSInteger row = [controlView rowForItem:proxyObject];
- NSInteger numberOfRows = [controlView numberOfRows];
+ NSInteger row = [self.outlineControlView rowForItem:proxyObject];
+ NSInteger numberOfRows = [self.outlineControlView numberOfRows];

if (row == 0) {
if (numberOfRows > 1) {
@@ -68,7 +68,9 @@
bezierPath = [NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS];
}

- } else if (row >= (numberOfRows-1) || [(id<AIMultiCellOutlineViewDelegate>)[controlView delegate] outlineView:controlView isGroup:[controlView itemAtRow:row+1]]) {
+ } else if (row >= (numberOfRows-1) ||
+ [(id<AIMultiCellOutlineViewDelegate>)self.outlineControlView.delegate outlineView:self.outlineControlView
+ isGroup:[self.outlineControlView itemAtRow:row+1]]) {
//Draw the bottom corners rounded if this is the last cell in a group
bezierPath = [NSBezierPath bezierPathWithRoundedBottomCorners:rect radius:MOCKIE_RADIUS];

@@ -105,7 +107,7 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = (highlightColor ?
[[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease] :
[NSGradient selectedControlGradient]);
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIListGroupBubbleCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupBubbleCell.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListGroupBubbleCell.m Thu Nov 14 22:19:56 2019 -0500
@@ -73,7 +73,7 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = (highlightColor ?
[[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease] :
[NSGradient selectedControlGradient]);
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIListGroupCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupCell.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListGroupCell.m Thu Nov 14 22:19:56 2019 -0500
@@ -181,7 +181,7 @@
NSBezierPath *arrowPath = [NSBezierPath bezierPath];
NSPoint center = NSMakePoint(rect.origin.x + rect.size.height*0.4f, rect.origin.y + (rect.size.height/2.0f));

- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[arrowPath moveToPoint:NSMakePoint(center.x - rect.size.height*0.3f, center.y - rect.size.height*0.15f)];
[arrowPath relativeLineToPoint:NSMakePoint( rect.size.height*0.6f, 0)];
[arrowPath relativeLineToPoint:NSMakePoint(-rect.size.height*0.3f, rect.size.height*0.4f)];
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIListGroupMockieCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupMockieCell.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListGroupMockieCell.m Thu Nov 14 22:19:56 2019 -0500
@@ -62,7 +62,7 @@
} else {
if (![self cellIsSelected]) {
[[self backgroundColor] set];
- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[[NSBezierPath bezierPathWithRoundedTopCorners:rect radius:MOCKIE_RADIUS] fill];
} else {
[[NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS] fill];
@@ -75,12 +75,12 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = (highlightColor ?
[[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease] :
[NSGradient selectedControlGradient]);

- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[gradient drawInBezierPath:[NSBezierPath bezierPathWithRoundedTopCorners:cellFrame radius:MOCKIE_RADIUS] angle:90.0f];
} else {
[gradient drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:cellFrame radius:MOCKIE_RADIUS] angle:90.0f];
@@ -91,7 +91,7 @@
//Remake of the cachedGradient method in AIListGroupCell, except supporting 2 gradients depending on group state
- (NSImage *)cachedGradient:(NSSize)inSize
{
- AIGroupState state = ([controlView isItemExpanded:proxyObject] ? AIGroupExpanded : AIGroupCollapsed);
+ AIGroupState state = ([self.outlineControlView isItemExpanded:proxyObject] ? AIGroupExpanded : AIGroupCollapsed);

if (!_mockieGradient[state] || !NSEqualSizes(inSize,_mockieGradientSize[state])) {
[_mockieGradient[state] release];
@@ -119,7 +119,7 @@
//upper corners so the group smoothly transitions to the contact below it.
- (void)drawBackgroundGradientInRect:(NSRect)rect
{
- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[[self backgroundGradient] drawInBezierPath:[NSBezierPath bezierPathWithRoundedTopCorners:rect radius:MOCKIE_RADIUS] angle:90.0f];
} else {
[[self backgroundGradient] drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS] angle:90.0f];
@@ -147,7 +147,7 @@
rect.origin.y += DROP_HIGHLIGHT_HEIGHT_MARGIN / 2.0f;

NSBezierPath *path;
- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
path = [NSBezierPath bezierPathWithRoundedTopCorners:rect radius:MOCKIE_RADIUS];
} else {
path = [NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS];
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIMessageEntryTextView.h
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Thu Nov 14 22:19:56 2019 -0500
@@ -68,7 +68,7 @@
NSColor *savedTextColor;
}

-@property (readwrite, assign, nonatomic) id<AIMessageEntryTextViewDelegate> delegate;
+@property (readwrite, assign, atomic) id<AIMessageEntryTextViewDelegate, NSTextDelegate> delegate;

//Configure
@property (readwrite, nonatomic) BOOL clearOnEscape;
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Thu Nov 14 22:19:56 2019 -0500
@@ -79,6 +79,7 @@
@implementation AISimpleTextView

@synthesize string;
+
- (void)dealloc
{
[string release];
@@ -121,6 +122,8 @@

@implementation AIMessageEntryTextView

+@dynamic delegate;
+
- (void)_initMessageEntryTextView
{
associatedView = nil;
@@ -214,16 +217,6 @@
[super dealloc];
}

-- (void) setDelegate:(id<AIMessageEntryTextViewDelegate>)del
-{
- super.delegate = del;
-}
-
-- (id<AIMessageEntryTextViewDelegate>)delegate
-{
- return (id<AIMessageEntryTextViewDelegate>)super.delegate;
-}
-
- (void)keyDown:(NSEvent *)inEvent
{
NSString *charactersIgnoringModifiers = [inEvent charactersIgnoringModifiers];
diff -r 325e2ab3406f -r 489d1e762237 Frameworks/Adium Framework/Source/AITextAttachmentExtension.h
--- a/Frameworks/Adium Framework/Source/AITextAttachmentExtension.h Thu Nov 14 21:09:06 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AITextAttachmentExtension.h Thu Nov 14 22:19:56 2019 -0500
@@ -31,7 +31,6 @@
@property (readwrite, nonatomic) BOOL shouldSaveImageForLogging;
@property (readwrite, nonatomic) BOOL hasAlternate;
@property (readwrite, nonatomic, copy) NSString *path;
-@property (readwrite, nonatomic, retain) NSImage *image;
@property (readonly, nonatomic) NSImage *iconImage;
@property (readonly, nonatomic) BOOL attachesAnImage;
@property (readwrite, nonatomic) BOOL shouldAlwaysSendAsText;
diff -r 325e2ab3406f -r 489d1e762237 Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m
--- a/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Thu Nov 14 22:19:56 2019 -0500
@@ -491,7 +491,7 @@
NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:NULL];
if (attributes && [attributes objectForKey:NSFilePosixPermissions]) {
NSNumber *posixInfo = [attributes objectForKey:NSFilePosixPermissions];
- posixFlags = [NSString stringWithFormat:@"%X", [posixInfo longValue]];
+ posixFlags = [NSString stringWithFormat:@"%lX", [posixInfo longValue]];
}

return posixFlags;
diff -r 325e2ab3406f -r 489d1e762237 Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Thu Nov 14 22:19:56 2019 -0500
@@ -383,7 +383,7 @@
// Let's create the hash
CC_SHA1([JPEGData bytes], (CC_LONG)[JPEGData length], digest);
imagehash = [[NSData dataWithBytes:digest length:20] retain];
- AILogWithSignature(@"Will update with hash %@; length is %u", imagehash, [JPEGData length]);
+ AILogWithSignature(@"Will update with hash %@; length is %lu", imagehash, (unsigned long)[JPEGData length]);
[self updatePHSH];
} else {
[[client client] reportError:@"Error adding image record" ofLevel:AWEzvWarning];
@@ -438,7 +438,7 @@
// Stop looking for new rendezvous clients
- (void)stopBrowsing
{
- AILogWithSignature(@"fServiceBrowser is %@ (retain count %i)", fServiceBrowser, [fServiceBrowser retainCount]);
+ AILogWithSignature(@"fServiceBrowser is %@ (retain count %lu)", fServiceBrowser, (unsigned long)[fServiceBrowser retainCount]);
[fServiceBrowser release]; fServiceBrowser = nil;
}

@@ -971,7 +971,7 @@
[self release];

} else {
- AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %d and data %s\n",
+ AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %lu and data %s\n",
DNSServiceRefSockFD(info), err, type, data);
}
}
diff -r 325e2ab3406f -r 489d1e762237 Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Thu Nov 14 22:19:56 2019 -0500
@@ -612,7 +612,7 @@
}
hexdata[[(NSData *)value length] * 2] = '\0';

- [infoData appendFormat:@"%c", ([(NSData *)value length] * 2 + [key length] + 1)];
+ [infoData appendFormat:@"%lu", ([(NSData *)value length] * 2 + [key length] + 1)];
[infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:[NSString stringWithUTF8String:hexdata]];
@@ -620,7 +620,7 @@
} else {
const char *val = [(NSString *)value UTF8String];
NSInteger len = strlen(val);
- [infoData appendFormat:@"%c", len + [key length] + 1];
+ [infoData appendFormat:@"%lu", len + [key length] + 1];
[infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:value];
diff -r 325e2ab3406f -r 489d1e762237 Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Thu Nov 14 22:19:56 2019 -0500
@@ -155,6 +155,6 @@

[string appendFormat:@"</%@>", name];

- return [NSString stringWithFormat:@"<AWEzvXMLNode %x:type %i:\"%@\">",self,type,string];
+ return [NSString stringWithFormat:@"<AWEzvXMLNode %@:type %i:\"%@\">",self,type,string];
}
@end
diff -r 325e2ab3406f -r 489d1e762237 Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Thu Nov 14 22:19:56 2019 -0500
@@ -1586,7 +1586,7 @@
NSMutableString *ms = [[NSMutableString alloc] init];
[ms appendString: [NSString stringWithFormat:@"<AsyncSocket %p", self]];
[ms appendString: [NSString stringWithFormat:@" local %@ remote %@ ", selfstr, peerstr]];
- [ms appendString: [NSString stringWithFormat:@"has queued %d reads %d writes, ", [theReadQueue count], [theWriteQueue count] ]];
+ [ms appendString: [NSString stringWithFormat:@"has queued %lu reads %d writes, ", (unsigned long)[theReadQueue count], [theWriteQueue count] ]];

if (theCurrentRead == nil)
[ms appendString: @"no current read, "];
@@ -1599,8 +1599,8 @@
else
percentDone = 100;

- [ms appendString: [NSString stringWithFormat:@"currently read %u bytes (%d%% done), ",
- [theCurrentRead->buffer length],
+ [ms appendString: [NSString stringWithFormat:@"currently read %lu bytes (%d%% done), ",
+ (unsigned long)[theCurrentRead->buffer length],
theCurrentRead->bytesDone ? percentDone : 0]];
}

@@ -1615,8 +1615,8 @@
else
percentDone = 100;

- [ms appendString: [NSString stringWithFormat:@"currently written %u (%d%%), ",
- [theCurrentWrite->buffer length],
+ [ms appendString: [NSString stringWithFormat:@"currently written %lu (%d%%), ",
+ (unsigned long)[theCurrentWrite->buffer length],
theCurrentWrite->bytesDone ? percentDone : 0]];
}

diff -r 325e2ab3406f -r 489d1e762237 Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Thu Nov 14 22:19:56 2019 -0500
@@ -375,7 +375,7 @@
// Status Code 200 - OK
CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1);
[self setHeaderFields:response forURI:[uri relativeString] appleSingle: isAppleSingle keepAlive:isKeepAlive];
- NSString *contentLength = [NSString stringWithFormat:@"%i", [data length]];
+ NSString *contentLength = [NSString stringWithFormat:@"%lu", (unsigned long)[data length]];
CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), (CFStringRef)contentLength);

//NSDictionary *responseHeaders = [(NSDictionary *)CFHTTPMessageCopyAllHeaderFields(response) autorelease];
diff -r 325e2ab3406f -r 489d1e762237 Plugins/Dual Window Interface/AIMessageTabViewItem.h
--- a/Plugins/Dual Window Interface/AIMessageTabViewItem.h Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Dual Window Interface/AIMessageTabViewItem.h Thu Nov 14 22:19:56 2019 -0500
@@ -32,12 +32,10 @@
- (void)tabViewItemWillDeselect;
- (void)tabViewDidChangeVisibility;

-@property (readonly, nonatomic) NSString *label;
@property (readonly, nonatomic) NSImage *icon;
@property (readonly, nonatomic) NSImage *statusIcon;
@property (readonly, nonatomic) NSImage *stateIcon;
@property (readonly, nonatomic) AIChat *chat;
-@property (readonly, nonatomic) NSImage *image;
@property (readonly, nonatomic) AIMessageViewController *messageViewController;
@property (readwrite, nonatomic, retain) AIMessageWindowController *windowController;

diff -r 325e2ab3406f -r 489d1e762237 Plugins/Dual Window Interface/AIMessageWindowController.h
--- a/Plugins/Dual Window Interface/AIMessageWindowController.h Thu Nov 14 21:09:06 2019 -0500
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.h Thu Nov 14 22:19:56 2019 -0500
@@ -71,11 +71,6 @@
*/
@property (readonly, nonatomic) NSArray *containedChats;

-/*
- * @brief The window
- */
-@property (readonly, nonatomic) NSWindow *window;
-
//Contained Chats
- (void)addTabViewItem:(AIMessageTabViewItem *)inTabViewItem;
- (void)addTabViewItem:(AIMessageTabViewItem *)inTabViewItem atIndex:(NSInteger)index silent:(BOOL)silent;
diff -r 325e2ab3406f -r 489d1e762237 Source/AIContactInfoImageViewWithImagePicker.m
--- a/Source/AIContactInfoImageViewWithImagePicker.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Source/AIContactInfoImageViewWithImagePicker.m Thu Nov 14 22:19:56 2019 -0500
@@ -209,7 +209,7 @@
BOOL mouseInside = [self mouse:mouseLocation inRect:snapbackRect];

resetImageTrackingTag = [self addTrackingRect:snapbackRect owner:self userData:nil assumeInside:mouseInside];
- if (mouseInside) [self mouseEntered:nil];
+ if (mouseInside) [self mouseEntered:[[[NSEvent alloc] init] autorelease]];
}
}

diff -r 325e2ab3406f -r 489d1e762237 Source/AIContactListImagePicker.m
--- a/Source/AIContactListImagePicker.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Source/AIContactListImagePicker.m Thu Nov 14 22:19:56 2019 -0500
@@ -225,7 +225,7 @@
BOOL mouseInside = NSPointInRect(localPoint, myFrame);

trackingTag = [self addTrackingRect:trackRect owner:self userData:nil assumeInside:mouseInside];
- if (mouseInside) [self mouseEntered:nil];
+ if (mouseInside) [self mouseEntered:[[[NSEvent alloc] init] autorelease]];
}
}

diff -r 325e2ab3406f -r 489d1e762237 Source/AIDockController.m
--- a/Source/AIDockController.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Source/AIDockController.m Thu Nov 14 22:19:56 2019 -0500
@@ -662,7 +662,7 @@
NSInteger contentCount = (showConversationCount ?
[adium.chatController unviewedConversationCount] : [adium.chatController unviewedContentCount]);
if (contentCount > 0 && shouldBadge)
- [dockTile setBadgeLabel:[NSString stringWithFormat:@"%d", contentCount]];
+ [dockTile setBadgeLabel:[NSString stringWithFormat:@"%ld", (long)contentCount]];
else
[dockTile setBadgeLabel:nil];
}
diff -r 325e2ab3406f -r 489d1e762237 Source/AIListWindowController.h
--- a/Source/AIListWindowController.h Thu Nov 14 21:09:06 2019 -0500
+++ b/Source/AIListWindowController.h Thu Nov 14 22:19:56 2019 -0500
@@ -46,7 +46,7 @@

@protocol AIContactListViewController, AIInterfaceContainer;

-@interface AIListWindowController : AIWindowController <AIInterfaceContainer, AIListControllerDelegate, AIRolloverButtonDelegate, NSTextFieldDelegate, NSAnimationDelegate, NSWindowDelegate> {
+@interface AIListWindowController : AIWindowController <AIInterfaceContainer, AIListControllerDelegate, AIRolloverButtonDelegate, NSTextFieldDelegate, NSAnimationDelegate, NSWindowDelegate, NSSearchFieldDelegate> {
BOOL borderless;

NSSize minWindowSize;
diff -r 325e2ab3406f -r 489d1e762237 Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Source/AILogViewerWindowController.m Thu Nov 14 22:19:56 2019 -0500
@@ -388,7 +388,7 @@

if (!isOpeningForContact) {
//If we're opening for a contact, the outline view selection will be changed in a moment anyways
- [self outlineViewSelectionDidChange:nil];
+ [self outlineViewSelectionDidChange:[[[NSNotification alloc] init] autorelease]];
}
}

@@ -449,7 +449,7 @@
[[[tableView_results tableColumnWithIdentifier:@"To"] headerCell] setStringValue:TO];
[[[tableView_results tableColumnWithIdentifier:@"From"] headerCell] setStringValue:FROM];
[[[tableView_results tableColumnWithIdentifier:@"Date"] headerCell] setStringValue:DATE];
- [self tableViewColumnDidResize:nil];
+ [self tableViewColumnDidResize:[[[NSNotification alloc] init] autorelease]];

[tableView_results sizeLastColumnToFit];

@@ -660,7 +660,7 @@
[resultsLock lock];
NSInteger count = [currentSearchResults count];
[resultsLock unlock];
- AILog(@"refreshResultsSearchIsComplete: %i (count is %i)",searchIsComplete,count);
+ AILog(@"refreshResultsSearchIsComplete: %i (count is %li)",searchIsComplete,(long)count);

if (searchIsComplete &&
((activeSearchID == searchIDToReattemptWhenComplete) && !windowIsClosing)) {
@@ -1978,7 +1978,7 @@
{
NSTableColumn *dateTableColumn = [tableView_results tableColumnWithIdentifier:@"Date"];

- if (!aNotification ||
+ if ([aNotification userInfo] == nil ||
([[aNotification userInfo] objectForKey:@"NSTableColumn"] == dateTableColumn)) {
NSDateFormatter *dateFormatter;
NSCell *cell = [dateTableColumn dataCell];
diff -r 325e2ab3406f -r 489d1e762237 Source/AIMessageWindow.m
--- a/Source/AIMessageWindow.m Thu Nov 14 21:09:06 2019 -0500
+++ b/Source/AIMessageWindow.m Thu Nov 14 22:19:56 2019 -0500
@@ -25,9 +25,9 @@
*/
@implementation AIMessageWindow

-- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
+- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)style backing:(NSBackingStoreType)backingStoreType defer:(BOOL)flag
{
- if (!(self = [super initWithContentRect:contentRect styleMask:styleMask backing:bufferingType defer:deferCreation]))
+ if (!(self = [super initWithContentRect:contentRect styleMask:style backing:backingStoreType defer:flag]))
return nil;

return self;