adium 2388:b454802ac946: twitter is deprecating this field, not ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b454802ac946
revision:	2388:b454802ac946
author:		Zachary West <zacw at adium.im>
date:		Thu May 28 20:55:15 2009 -0400

twitter is deprecating this field, not that it ever worked. Remove the code for it.

diffs (81 lines):

diff -r c45178eaadde -r b454802ac946 Plugins/Twitter Plugin/AITwitterAccount.h
--- a/Plugins/Twitter Plugin/AITwitterAccount.h	Thu May 28 20:53:41 2009 -0400
+++ b/Plugins/Twitter Plugin/AITwitterAccount.h	Thu May 28 20:55:15 2009 -0400
@@ -130,7 +130,6 @@
 #define TWITTER_INFO_DISPLAY_NAME			@"name"
 #define TWITTER_INFO_UID					@"screen_name"
 #define TWITTER_INFO_ICON					@"profile_image_url"
-#define TWITTER_INFO_NOTIFICATION			@"notifications"
 
 // Rate Limit
 #define TWITTER_RATE_LIMIT_HOURLY_LIMIT		@"hourly-limit"
diff -r c45178eaadde -r b454802ac946 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m	Thu May 28 20:53:41 2009 -0400
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m	Thu May 28 20:55:15 2009 -0400
@@ -610,27 +610,24 @@
 	[menuItem setImage:serviceIcon];
 	[menuItem setRepresentedObject:inContact];
 	[menuItemArray addObject:menuItem];	
-	
-	// XXX Enable if() when twitter sends extended user info for all requests.
-//	if(inContact.isStranger || ![inContact boolValueForProperty:@"Twitter Notifications"]) {
-		menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Enable device notifications for %@",nil), inContact.UID]
-																		 target:self
-																		 action:@selector(enableOrDisableNotifications:)
-																  keyEquivalent:@""] autorelease];
-		[menuItem setTag:YES];
-		[menuItem setImage:serviceIcon];
-		[menuItem setRepresentedObject:inContact];
-		[menuItemArray addObject:menuItem];
-//	} else if (inContact.isStranger || [inContact boolValueForProperty:@"Twitter Notifications"]) {
-		menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Disable device notifications for %@",nil), inContact.UID]
-																		 target:self
-																		 action:@selector(enableOrDisableNotifications:)
-																  keyEquivalent:@""] autorelease];
-		[menuItem setTag:NO];
-		[menuItem setImage:serviceIcon];
-		[menuItem setRepresentedObject:inContact];
-		[menuItemArray addObject:menuItem];
-//	}
+
+	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Enable device notifications for %@",nil), inContact.UID]
+																	 target:self
+																	 action:@selector(enableOrDisableNotifications:)
+															  keyEquivalent:@""] autorelease];
+	[menuItem setTag:YES];
+	[menuItem setImage:serviceIcon];
+	[menuItem setRepresentedObject:inContact];
+	[menuItemArray addObject:menuItem];
+
+	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:AILocalizedString(@"Disable device notifications for %@",nil), inContact.UID]
+																	 target:self
+																	 action:@selector(enableOrDisableNotifications:)
+															  keyEquivalent:@""] autorelease];
+	[menuItem setTag:NO];
+	[menuItem setImage:serviceIcon];
+	[menuItem setRepresentedObject:inContact];
+	[menuItemArray addObject:menuItem];
 	
 	return menuItemArray;	
 }
@@ -2211,9 +2208,6 @@
 				statusText = @"";
 			[listContact setStatusMessage:[NSAttributedString stringWithString:[statusText stringByUnescapingFromXMLWithEntities:nil]] notify:NotifyLater];
 			
-
-			[listContact setValue:[info objectForKey:TWITTER_INFO_NOTIFICATION] forProperty:@"Twitter Notifications" notify:NotifyLater];
-			
 			// Set the user as online.
 			[listContact setOnline:YES notify:NotifyLater silently:silentAndDelayed];
 			
@@ -2349,9 +2343,7 @@
 		BOOL			enableNotification = ([self requestTypeForRequestID:identifier] == AITwitterNotificationEnable);
 		AIListContact	*listContact = [[self dictionaryForRequestID:identifier] objectForKey:@"ListContact"];
 		
-		for (NSDictionary *info in userInfo) {
-			[listContact setValue:[info objectForKey:TWITTER_INFO_NOTIFICATION] forProperty:@"Twitter Notifications" notify:NotifyLater];
-		
+		for (NSDictionary *info in userInfo) {		
 			[adium.interfaceController handleMessage:(enableNotification ?
 													  AILocalizedString(@"Notifications Enabled", nil) :
 													  AILocalizedString(@"Notifications Disabled", nil))