adium 5028:a5b24a9d8bb5: This branch is by definition onLionOrNe...

commits at adium.im commits at adium.im
Wed Sep 5 22:31:33 UTC 2012


details:	http://hg.adium.im/adium/rev/a5b24a9d8bb5
revision:	5028:a5b24a9d8bb5
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Thu Sep 06 00:29:35 2012 +0200

This branch is by definition onLionOrNewer.

diffs (22 lines):

diff -r b62ccf3a75ba -r a5b24a9d8bb5 Source/ESiTunesPlugin.m
--- a/Source/ESiTunesPlugin.m	Thu Sep 06 00:18:31 2012 +0200
+++ b/Source/ESiTunesPlugin.m	Thu Sep 06 00:29:35 2012 +0200
@@ -558,17 +558,7 @@
 
 	//configure the popup button and its menu
 
-    /* XXX Remove after 10.6: Apparently with iTunes 10.6.3 on Mac OS X 10.6.8, the NSIconRefImageRep
-     * that is returned by -iconfForFile: for iTunes fails to encode itself for NSCopying. Make a copy
-     * here via -TIFFRepresentation to avoid this bug.
-     * rdar://11930126 http://trac.adium.im/ticket/16046
-     */
-    if ([NSApp isOnLionOrNewer]) {
-        [button setImage:[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath]];
-    } else {
-        NSData *imageData = [[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath] TIFFRepresentation];
-	    [button setImage:[[[NSImage alloc] initWithData:imageData] autorelease]];
-    }
+	[button setImage:[[NSWorkspace sharedWorkspace] iconForFile:iTunesPath]];
 	[self createiTunesToolbarItemMenuItems:menu];
 
 	NSToolbarItem * iTunesItem = [AIToolbarUtilities toolbarItemWithIdentifier:KEY_TRIGGERS_TOOLBAR




More information about the commits mailing list