adium 2480:b5a1901be01c: Build fix :(

commits at adium.im commits at adium.im
Wed Jun 10 06:21:11 UTC 2009


details:	http://hg.adium.im/adium/rev/b5a1901be01c
revision:	2480:b5a1901be01c
author:		David Smith <catfish.man at gmail.com>
date:		Tue Jun 09 23:11:35 2009 -0700

Build fix :(
Subject: adium 2481:10f927df5992: This is old and wrong, as far as I can tell. Also it crashes.

details:	http://hg.adium.im/adium/rev/10f927df5992
revision:	2481:10f927df5992
author:		David Smith <catfish.man at gmail.com>
date:		Tue Jun 09 23:21:05 2009 -0700

This is old and wrong, as far as I can tell. Also it crashes.

diffs (40 lines):

diff -r 450dc74af60d -r 10f927df5992 Source/ESFileTransferProgressView.m
--- a/Source/ESFileTransferProgressView.m	Tue Jun 09 22:46:09 2009 -0700
+++ b/Source/ESFileTransferProgressView.m	Tue Jun 09 23:21:05 2009 -0700
@@ -121,10 +121,7 @@
 			[progressIndicator setDisplayedWhenStopped:NO];
 			[progressIndicator setIndeterminate:YES];
 			[progressIndicator stopAnimation:self];
-
-			//I don't trust setDisplayedWhenStopped... call me crazy.
-			[progressIndicator setFrame:NSZeroRect];
-			[progressIndicator setNeedsDisplay:YES];
+			[progressIndicator setHidden:YES];
 			
 			//Top objects moving down
 			{
@@ -152,9 +149,6 @@
 				[box_transferStatusFrame setFrame:frame];
 			}
 		}
-		
-		//Display immediately
-		[[self window] display];
 	}
 }
 
diff -r 450dc74af60d -r 10f927df5992 Source/ESStatusSort.m
--- a/Source/ESStatusSort.m	Tue Jun 09 22:46:09 2009 -0700
+++ b/Source/ESStatusSort.m	Tue Jun 09 23:21:05 2009 -0700
@@ -567,8 +567,10 @@
  *
  * It's magic... but it's efficient magic!
  */
-NSInteger statusSort(id objectA, id objectB, BOOL groups, id<AIContainingObject> container)
+NSInteger statusSort(id objA, id objB, BOOL groups, id<AIContainingObject> container)
 {
+	AIListObject *objectA = (AIListObject *)objA;
+	AIListObject *objectB = (AIListObject *)objB;
 	if (groups) {
 		if (sortGroupsAlphabetically) {
 			return [((AIListObject *)objectA).displayName compare:((AIListObject *)objectB).displayName];




More information about the commits mailing list