adium 5013:2a488b40cf74: Following an anonymous tip, disable the...
commits at adium.im
commits at adium.im
Mon Aug 20 09:08:18 UTC 2012
details: http://hg.adium.im/adium/rev/2a488b40cf74
revision: 5013:2a488b40cf74
branch: adium-1.5.4
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Mon Aug 20 11:07:36 2012 +0200
Following an anonymous tip, disable the compatibility workaround introduced in http://hg.adium.im/adium/rev/635d3c31c55d when not on 10.6 as it's a major memory hit.
diffs (18 lines):
diff -r 6885cc11568c -r 2a488b40cf74 Source/ESiTunesPlugin.m
--- a/Source/ESiTunesPlugin.m Fri Aug 17 21:33:51 2012 -0400
+++ b/Source/ESiTunesPlugin.m Mon Aug 20 11:07:36 2012 +0200
@@ -572,8 +572,12 @@
* here via -TIFFRepresentation to avoid this bug.
* rdar://11930126 http://trac.adium.im/ticket/16046
*/
- NSData *imageData = [[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath] TIFFRepresentation];
- [button setImage:[[[NSImage alloc] initWithData:imageData] autorelease]];
+ if ([NSApp isOnLionOrNewer]) {
+ [button setImage:[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath]];
+ } else {
+ NSData *imageData = [[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath] TIFFRepresentation];
+ [button setImage:[[[NSImage alloc] initWithData:imageData] autorelease]];
+ }
[self createiTunesToolbarItemMenuItems:menu];
NSToolbarItem * iTunesItem = [AIToolbarUtilities toolbarItemWithIdentifier:KEY_TRIGGERS_TOOLBAR
More information about the commits
mailing list