adium 5765:475ac63556bf: Docs: add the location of user icons to...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/475ac63556bf
revision:	5765:475ac63556bf
branch:		adium-1.5.9
author:		Robert Vehse <robertvehse at fastmail.fm>
date:		Fri Nov 22 18:24:16 2013 +0100

Docs: add the location of user icons to the list Adium file locations.
Subject: adium 5766:7a7aed005b2b: -dissolveToPoint is deprecated, change to -drawAtPoint fixes #16362.

details:	http://hg.adium.im/adium/rev/7a7aed005b2b
revision:	5766:7a7aed005b2b
branch:		adium-1.5.9
author:		Frank Dowsett <wixardy at adium.im>
date:		Thu Apr 25 14:09:50 2013 -0400

-dissolveToPoint is deprecated, change to -drawAtPoint fixes #16362.
(grafted from ff13562cc57345c6d13bb51fa1f9357152852102)

diffs (64 lines):

diff -r 286fca122412 -r 7a7aed005b2b AdiumHelp/pgs/Miscellaneous-LocationsAdiumFiles.html
--- a/AdiumHelp/pgs/Miscellaneous-LocationsAdiumFiles.html	Wed Nov 13 20:29:07 2013 +0100
+++ b/AdiumHelp/pgs/Miscellaneous-LocationsAdiumFiles.html	Thu Apr 25 14:09:50 2013 -0400
@@ -58,6 +58,17 @@
 	</div>
 	<div class="taskboxline">
 		<div class="taskboxheader">
+			<h3>Location of user icons</h3>
+		</div>
+		<div class="taskboxtext">
+			<p><strong>Your own icons</strong></p>
+			<p>Recent icons set via the icon picker (both for contacts and for yourself) are cached at ~/Library/Images/iChat Recent Pictures, and such recent icons are shared with iChat.</p>
+			<p><strong>Icons of your contacts</strong></p>
+			<p>Icons, once retrieved, are cached at ~/Library/Caches/Adium/Default. (The "Library" folder is hidden in OS X versions 10.7 and newer. See this article for details.)</p>
+		</div>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
 			<h3>Location of non-standard, installed Xtras</h3>
 		</div>
 		<div class="taskboxtext">
diff -r 286fca122412 -r 7a7aed005b2b Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m	Wed Nov 13 20:29:07 2013 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m	Thu Apr 25 14:09:50 2013 -0400
@@ -263,7 +263,7 @@
 	
 	//Draw our original image as 50% transparent
 	[dragImage lockFocus];
-	[[self image] dissolveToPoint:NSZeroPoint fraction:0.5f];
+	[[self image] drawAtPoint:NSZeroPoint fromRect:NSMakeRect(0, 0, self.image.size.width, self.image.size.height) operation:NSCompositeCopy fraction:0.5f];
 	[dragImage unlockFocus];
 	
 	//We want the image to resize
diff -r 286fca122412 -r 7a7aed005b2b Source/AIContactInfoImageViewWithImagePicker.m
--- a/Source/AIContactInfoImageViewWithImagePicker.m	Wed Nov 13 20:29:07 2013 +0100
+++ b/Source/AIContactInfoImageViewWithImagePicker.m	Thu Apr 25 14:09:50 2013 -0400
@@ -91,26 +91,8 @@
 		}
 		
 		[[NSBezierPath bezierPathWithOvalInRect:snapBackRect] fill];
-		[snapbackImage dissolveToPoint:snapBackRect.origin fraction:1.0f];
+		[snapbackImage drawAtPoint:snapBackRect.origin fromRect:[self bounds] operation:NSCompositeSourceOver fraction:1.0f];
 	}
-		
-	/*
-	if (hovered) {
-		[[[NSColor blackColor] colorWithAlphaComponent:0.40] set];
-		[clipPath fill];
-		
-		//Draw the arrow
-		NSBezierPath	*arrowPath = [NSBezierPath bezierPath];
-		NSRect			frame = [self frame];
-		[arrowPath moveToPoint:NSMakePoint(frame.size.width - ARROW_XOFFSET - ARROW_WIDTH, 
-										   (ARROW_YOFFSET + ARROW_HEIGHT))];
-		[arrowPath relativeLineToPoint:NSMakePoint(ARROW_WIDTH, 0)];
-		[arrowPath relativeLineToPoint:NSMakePoint(-(ARROW_WIDTH/2), -(ARROW_HEIGHT))];
-		
-		[[NSColor whiteColor] set];
-		[arrowPath fill];
-	}
-	*/
 
 	[NSGraphicsContext restoreGraphicsState];
 }