adium 2368:ba7984fe4779: Be a bit more conservative about prompt...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/ba7984fe4779
revision:	2368:ba7984fe4779
author:		Zachary West <zacw at adium.im>
date:		Thu May 28 11:22:49 2009 -0400

Be a bit more conservative about prompting for IRC NickServ passwords. Fixes #12258.

diffstat:

 Plugins/Purple Service/AIIRCServicesPasswordPlugin.m |  20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diffs (30 lines):

diff -r 839d004bffb7 -r ba7984fe4779 Plugins/Purple Service/AIIRCServicesPasswordPlugin.m
--- a/Plugins/Purple Service/AIIRCServicesPasswordPlugin.m	Thu May 28 01:38:07 2009 -0400
+++ b/Plugins/Purple Service/AIIRCServicesPasswordPlugin.m	Thu May 28 11:22:49 2009 -0400
@@ -79,17 +79,15 @@
 	if (validService) {
 		NSString *message = contentObject.message.string;
 		
-		if(([message rangeOfString:@"NickServ" options:NSCaseInsensitiveSearch].location != NSNotFound
-			&& [message rangeOfString:@"ID" options:NSCaseInsensitiveSearch].location != NSNotFound) ||
-		   [self message:message containsFragments:[NSArray arrayWithObjects:
-														  @"identify yourself",
-														  @"authentication required",
-														  @"nickname is registered",
-														  @"nickname is owned",
-														  @"nick is owned",
-														  @"nick belongs to another user",
-														  @"invalid",
-														  @"incorrect", nil]]) {
+		if([self message:message containsFragments:[NSArray arrayWithObjects:
+													@"identify yourself",
+													@"authentication required",
+													@"nickname is registered",
+													@"nickname is owned",
+													@"nick is owned",
+													@"nick belongs to another user",
+													@"invalid password",
+													@"incorrect password", nil]]) {
 			
 			[account setValue:nil forProperty:@"Identifying" notify:NotifyNever];