adium-1.4 2961:2c563dc02354: backedout 45171459da46 and f05b1531...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/2c563dc02354
revision:	2961:2c563dc02354
author:		Frank Dowsett <wixardy at adium.im>
date:		Fri May 14 23:02:09 2010 -0400

backedout 45171459da46 and f05b1531dd0a since this was fixed in b2a5e63a0760. Fixes #13990

diffs (48 lines):

diff -r f5646d3ecee5 -r 2c563dc02354 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m	Fri May 14 17:50:16 2010 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m	Fri May 14 23:02:09 2010 -0400
@@ -1029,10 +1029,6 @@
 		updateAfterSend = [[prefDict objectForKey:TWITTER_PREFERENCE_UPDATE_AFTER_SEND] boolValue];
 		retweetLink = [[prefDict objectForKey:TWITTER_PREFERENCE_RETWEET_SPAM] boolValue];
 		
-#if 0
-		/*
-		 Temporarily disabled for 1.4b18, since I don't have the time to fix the cursor iteration on user pages yet.
-		 */
 		if ([key isEqualToString:TWITTER_PREFERENCE_LOAD_CONTACTS] && self.online) {
 			if ([[prefDict objectForKey:TWITTER_PREFERENCE_LOAD_CONTACTS] boolValue]) {
 				// Delay updates when loading our contacts list.
@@ -1057,8 +1053,7 @@
 				[self removeAllContacts];
 			}
 		}
-#endif
-	}	
+	}
 }
 
 #pragma mark Periodic update scheduler
@@ -2437,10 +2432,6 @@
 		if([self requestTypeForRequestID:identifier] == AITwitterValidateCredentials) {
 			// Our UID is definitely set; grab our friends.
 			
-#if 0
-			/*
-				Temporarily disabled for 1.4b18, since I don't have the time to fix the cursor iteration on user pages yet.
-			 */
 			if ([[self preferenceForKey:TWITTER_PREFERENCE_LOAD_CONTACTS group:TWITTER_PREFERENCE_GROUP_UPDATES] boolValue]) {
 				// If we load our follows as contacts, do so now.
 				
@@ -2458,12 +2449,9 @@
 					[self didDisconnect];
 				}
 			} else {
-#endif
 				// If we don't load follows as contacts, we've finished connecting (fast, wasn't it?)
 				[self didConnect];
-#if 0
 			}
-#endif
 		}
 	} else if ([self requestTypeForRequestID:identifier] == AITwitterNotificationEnable ||
 			   [self requestTypeForRequestID:identifier] == AITwitterNotificationDisable) {