adium 3756:076e2b9ecdc1: Merge 9bc0cfa2fa0d to 10.6+ branch
commits at adium.im
commits at adium.im
Wed Mar 16 06:44:13 UTC 2011
details: http://hg.adium.im/adium/rev/076e2b9ecdc1
revision: 3756:076e2b9ecdc1
branch: 10.6+
author: Stephen Holt <sholt at adium.im>
date: Tue Mar 15 23:26:18 2011 -0700
Merge 9bc0cfa2fa0d to 10.6+ branch
Subject: adium 3757:5067f5e9d2b4: Deprecated NSImage methods with replacements only available on 10.6 (on 10.6+ branch only)
details: http://hg.adium.im/adium/rev/5067f5e9d2b4
revision: 3757:5067f5e9d2b4
branch: 10.6+
author: Stephen Holt <sholt at adium.im>
date: Tue Mar 15 23:31:39 2011 -0700
Deprecated NSImage methods with replacements only available on 10.6 (on 10.6+ branch only)
Subject: adium 3758:2e6e5b58d248: Some protocol warning cleanup.
details: http://hg.adium.im/adium/rev/2e6e5b58d248
revision: 3758:2e6e5b58d248
branch: 10.6+
author: Stephen Holt <sholt at adium.im>
date: Tue Mar 15 23:34:03 2011 -0700
Some protocol warning cleanup.
Subject: adium 3759:2704a3edeac9: No need for stringWithFormat: here either
details: http://hg.adium.im/adium/rev/2704a3edeac9
revision: 3759:2704a3edeac9
branch: 10.6+
author: Stephen Holt <sholt at adium.im>
date: Tue Mar 15 23:42:24 2011 -0700
No need for stringWithFormat: here either
Subject: adium 3760:d68efb0361de: But we do need a formatted string here...
details: http://hg.adium.im/adium/rev/d68efb0361de
revision: 3760:d68efb0361de
branch: 10.6+
author: Stephen Holt <sholt at adium.im>
date: Tue Mar 15 23:42:57 2011 -0700
But we do need a formatted string here...
diffs (193 lines):
diff -r 09d5fa4f3286 -r d68efb0361de Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Tue Mar 15 23:42:57 2011 -0700
@@ -103,7 +103,7 @@
NSImageRep *bestRep;
if (allowAnimation &&
- (bestRep = [self bestRepresentationForDevice:nil]) &&
+ (bestRep = [self bestRepresentationForRect:NSMakeRect(0, 0, self.size.width, self.size.height) context:nil hints:nil]) &&
[bestRep isKindOfClass:[NSBitmapImageRep class]] &&
(delta == 1.0) &&
([[(NSBitmapImageRep *)bestRep valueForProperty:NSImageFrameCount] intValue] > 1) ) {
diff -r 09d5fa4f3286 -r d68efb0361de Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m Tue Mar 15 23:42:57 2011 -0700
@@ -597,7 +597,7 @@
NSOpenPanel *openPanel;
openPanel = [NSOpenPanel openPanel];
- [openPanel setTitle:[NSString stringWithFormat:AILocalizedStringFromTableInBundle(@"Select Image", nil, [NSBundle bundleWithIdentifier:AIUTILITIES_BUNDLE_ID], nil)]];
+ [openPanel setTitle:AILocalizedStringFromTableInBundle(@"Select Image", nil, [NSBundle bundleWithIdentifier:AIUTILITIES_BUNDLE_ID], nil)];
[openPanel setAllowedFileTypes:[NSImage imageFileTypes]];
if ([openPanel runModal] == NSOKButton) {
diff -r 09d5fa4f3286 -r d68efb0361de Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h
--- a/Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h Tue Mar 15 23:01:11 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h Tue Mar 15 23:42:57 2011 -0700
@@ -60,8 +60,6 @@
- (BOOL)popUpMenuPositioningItem:(NSMenuItem *)item atLocation:(NSPoint)location inView:(NSView *)view;
@end
- at protocol NSDraggingDestination
- at end
@protocol NSToolbarDelegate
@end
@protocol NSSplitViewDelegate
diff -r 09d5fa4f3286 -r d68efb0361de Frameworks/AIUtilities Framework/Source/AIStringUtilities.h
--- a/Frameworks/AIUtilities Framework/Source/AIStringUtilities.h Tue Mar 15 23:01:11 2011 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIStringUtilities.h Tue Mar 15 23:42:57 2011 -0700
@@ -17,11 +17,11 @@
//Note that while NSLocalizedString() uses the main bundle, AILocalizedString() uses [self class]'s bundle
#define AILocalizedString(key, comment) \
- AILocalizedStringFromTableInBundle(key, nil, [NSBundle bundleForClass:[self class]], comment)
+ AILocalizedStringFromTableInBundle((key), nil, [NSBundle bundleForClass:[self class]], (comment) )
//Like NSLocalizedString(), AILocalizedString() looks to the main bundle
#define AILocalizedStringFromTable(key, table, comment) \
- AILocalizedStringFromTableInBundle(key, table, [NSBundle mainBundle], comment)
+ AILocalizedStringFromTableInBundle( (key), (table), [NSBundle mainBundle], (comment) )
#define AILocalizedStringFromTableInBundle(key, table, bundle, comment) \
NSLocalizedStringFromTableInBundle(key, table, bundle, comment)
diff -r 09d5fa4f3286 -r d68efb0361de Frameworks/Adium Framework/Source/AIMessageEntryTextView.h
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Tue Mar 15 23:01:11 2011 -0700
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Tue Mar 15 23:42:57 2011 -0700
@@ -20,7 +20,7 @@
@class AIListContact, AIAccount, AIChat;
- at protocol AIMessageEntryTextViewDelegate <NSObject>
+ at protocol AIMessageEntryTextViewDelegate <NSTextViewDelegate,NSObject>
@optional
/*!
* @brief Should the tab key trigger an autocomplete?
diff -r 09d5fa4f3286 -r d68efb0361de Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Tue Mar 15 23:42:57 2011 -0700
@@ -223,7 +223,7 @@
- (id<AIMessageEntryTextViewDelegate>)delegate
{
- return super.delegate;
+ return (id<AIMessageEntryTextViewDelegate>)super.delegate;
}
- (void)keyDown:(NSEvent *)inEvent
diff -r 09d5fa4f3286 -r d68efb0361de Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m
--- a/Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m Tue Mar 15 23:42:57 2011 -0700
@@ -315,7 +315,7 @@
// inform the user
[[[manager client] client] reportError:[NSString stringWithFormat: @"Download failed! Error - %@ %@",
[error localizedDescription],
- [[error userInfo] objectForKey:NSErrorFailingURLStringKey]] ofLevel: AWEzvError];
+ [[error userInfo] objectForKey:NSURLErrorFailingURLStringErrorKey]] ofLevel: AWEzvError];
[download release];
}
- (void)downloadDidFinish:(NSURLDownload *)download
diff -r 09d5fa4f3286 -r d68efb0361de Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Tue Mar 15 23:42:57 2011 -0700
@@ -552,13 +552,13 @@
if(theDelegate == NULL)
{
NSString *message = @"Attempting to connect without a delegate. Set a delegate first.";
- [NSException raise:AsyncSocketException format:message];
+ [NSException raise:AsyncSocketException format:@"%@",message];
}
if(theSocket != NULL || theSocket6 != NULL)
{
NSString *message = @"Attempting to connect while connected or accepting connections. Disconnect first.";
- [NSException raise:AsyncSocketException format:message];
+ [NSException raise:AsyncSocketException format:@"%@",message];
}
BOOL pass = YES;
@@ -595,13 +595,13 @@
if (theDelegate == NULL)
{
NSString *message = @"Attempting to connect without a delegate. Set a delegate first.";
- [NSException raise:AsyncSocketException format:message];
+ [NSException raise:AsyncSocketException format:@"%@",message];
}
if (theSocket != NULL || theSocket6 != NULL)
{
NSString *message = @"Attempting to connect while connected or accepting connections. Disconnect first.";
- [NSException raise:AsyncSocketException format:message];
+ [NSException raise:AsyncSocketException format:@"%@",message];
}
BOOL pass = YES;
diff -r 09d5fa4f3286 -r d68efb0361de Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Plugins/Purple Service/CBPurpleAccount.m Tue Mar 15 23:42:57 2011 -0700
@@ -2692,7 +2692,7 @@
char **prpl_formats = g_strsplit(prpl_info->icon_spec.format,",",0);
//Look for gif first if the image is animated
- NSImageRep *imageRep = [image bestRepresentationForDevice:nil] ;
+ NSImageRep *imageRep = [image bestRepresentationForRect:NSMakeRect(0, 0, imageSize.width, imageSize.height) context:nil hints:nil];
if ([imageRep isKindOfClass:[NSBitmapImageRep class]] &&
[[(NSBitmapImageRep *)imageRep valueForProperty:NSImageFrameCount] integerValue] > 1) {
@@ -3015,7 +3015,7 @@
- (NSString *)titleForAccountActionMenuLabel:(const char *)label
{
if ((strcmp(label, _("Change Password...")) == 0) || (strcmp(label, _("Change Password")) == 0)) {
- return [[NSString stringWithFormat:AILocalizedString(@"Change Password", "Menu item title for changing the password of an account")] stringByAppendingEllipsis];
+ return [AILocalizedString(@"Change Password", "Menu item title for changing the password of an account") stringByAppendingEllipsis];
} else {
return [NSString stringWithUTF8String:label];
}
diff -r 09d5fa4f3286 -r d68efb0361de Plugins/WebKit Message View/AIWebKitDelegate.h
--- a/Plugins/WebKit Message View/AIWebKitDelegate.h Tue Mar 15 23:01:11 2011 -0700
+++ b/Plugins/WebKit Message View/AIWebKitDelegate.h Tue Mar 15 23:42:57 2011 -0700
@@ -23,7 +23,7 @@
@class AIWebKitMessageViewController;
- at interface AIWebKitDelegate : NSObject <NSDraggingDestination>{
+ at interface AIWebKitDelegate : NSObject {
NSMutableDictionary *mapping;
}
diff -r 09d5fa4f3286 -r d68efb0361de Plugins/WebKit Message View/AIWebKitMessageViewController.h
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.h Tue Mar 15 23:01:11 2011 -0700
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.h Tue Mar 15 23:42:57 2011 -0700
@@ -23,7 +23,7 @@
* @class AIWebKitMessageViewController AIWebKitMessageViewController.h
* @brief Main class for the webkit message view. Most of the good stuff happens here
*/
- at interface AIWebKitMessageViewController : NSObject <AIMessageDisplayController,NSDraggingDestination> {
+ at interface AIWebKitMessageViewController : NSObject <AIMessageDisplayController> {
AIWebKitDelegate *delegateProxy;
id plugin;
diff -r 09d5fa4f3286 -r d68efb0361de Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Source/AIListWindowController.m Tue Mar 15 23:42:57 2011 -0700
@@ -1424,7 +1424,7 @@
// Save window that we could possible attach to
if (bottom == 2)
- attachToBottom = [neighborWindow delegate];
+ attachToBottom = (AIListWindowController *)[neighborWindow delegate];
return location;
}
diff -r 09d5fa4f3286 -r d68efb0361de Source/AdiumMessageEvents.m
--- a/Source/AdiumMessageEvents.m Tue Mar 15 23:01:11 2011 -0700
+++ b/Source/AdiumMessageEvents.m Tue Mar 15 23:42:57 2011 -0700
@@ -82,7 +82,7 @@
switch (errorType) {
case AIChatUnknownError:
- message = [NSString stringWithFormat:AILocalizedString(@"Unknown conversation error.",nil)];
+ message = AILocalizedString(@"Unknown conversation error.",nil);
break;
case AIChatMessageSendingUserNotAvailable:
More information about the commits
mailing list