adium 3398:a19c59750f20: I hope this fixes some of the crashes t...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/a19c59750f20
revision:	3398:a19c59750f20
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Fri Oct 22 23:25:33 2010 +0200

I hope this fixes some of the crashes that have been occuring with my previous commits. It might just postpone the crashing, though.

diffs (62 lines):

diff -r a3cebb3ee233 -r a19c59750f20 Frameworks/Adium Framework/Source/AIMetaContact.m
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m	Fri Oct 22 12:44:17 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m	Fri Oct 22 23:25:33 2010 +0200
@@ -687,7 +687,9 @@
 	if (properties == nil) {
 		properties = [[NSArray alloc] initWithObjects:@"isOnline", @"isEvent", @"isBlocked",
 					  @"isIdle", @"notAStranger", @"isMobile", @"signedOff", @"signedOn",
-					  @"alwaysOnline", @"unviewedContent", @"unviewedMention", nil];
+					  @"alwaysOnline", @"unviewedContent", @"unviewedMention",
+					  @"idleSince", @"idleReadable", @"serverDispalyName", @"formattedUID",
+					  @"textProfile", @"listObjectStatusMessage", nil];
 	}
 	return properties;
 }
@@ -699,7 +701,7 @@
 	if ([[[self class] _forwardedProperties] containsObject:key]) {
 		ret = [self.preferredContact valueForProperty:key];
 	} else {
-		ret = [super valueForProperty:key] ?: [self.preferredContact valueForProperty:key];
+		ret = [super valueForProperty:key];
 	}
 	
 	return ret;
@@ -712,7 +714,7 @@
 	if ([[[self class] _forwardedProperties] containsObject:key]) {
 		ret = [self.preferredContact integerValueForProperty:key];
 	} else {
-		ret = [super integerValueForProperty:key] ?: [self.preferredContact integerValueForProperty:key];
+		ret = [super integerValueForProperty:key];
 	}
 	
 	return ret;
@@ -725,7 +727,7 @@
 	if ([[[self class] _forwardedProperties] containsObject:key]) {
 		ret = [self.preferredContact intValueForProperty:key];
 	} else {
-		ret = [super intValueForProperty:key] ?: [self.preferredContact intValueForProperty:key];
+		ret = [super intValueForProperty:key];
 	}
 	
 	return ret;
@@ -738,7 +740,7 @@
 	if ([[[self class] _forwardedProperties] containsObject:key]) {
 		ret = [self.preferredContact boolValueForProperty:key];
 	} else {
-		ret = [super boolValueForProperty:key] ?: [self.preferredContact boolValueForProperty:key];
+		ret = [super boolValueForProperty:key];
 	}
 	
 	return ret;
diff -r a3cebb3ee233 -r a19c59750f20 Frameworks/Adium Framework/Source/ESObjectWithProperties.m
--- a/Frameworks/Adium Framework/Source/ESObjectWithProperties.m	Fri Oct 22 12:44:17 2010 -0500
+++ b/Frameworks/Adium Framework/Source/ESObjectWithProperties.m	Fri Oct 22 23:25:33 2010 +0200
@@ -243,7 +243,7 @@
 			AILogWithSignature(@" *** This ivar is not an object but an %s! Should not use -valueForProperty: @\"%@\" ***", ivarType, key);
 			
 		} else {
-			ret = [[value retain] autorelease];
+			ret = value;
 		}
 	}