adium 4317:9d785edcd02c: As discussed on the devel mailing list,...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/9d785edcd02c
revision:	4317:9d785edcd02c
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Sat Nov 26 15:25:31 2011 -0800

As discussed on the devel mailing list, backing out changeset eb53d7749f4b. Refs #15020.

This change only made sense if the password for a service was the same as a users server password. This may not always be the case, so we must ask.

diffs (16 lines):

diff -r eb53d7749f4b -r 9d785edcd02c Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m	Fri Nov 25 12:36:33 2011 +0100
+++ b/Source/AdiumPasswords.m	Sat Nov 26 15:25:31 2011 -0800
@@ -384,11 +384,7 @@
 
 - (void)passwordForType:(AISpecialPasswordType)inType forAccount:(AIAccount *)inAccount promptOption:(AIPromptOption)inOption name:(NSString *)inName notifyingTarget:(id)inTarget selector:(SEL)inSelector context:(id)inContext
 {
-	NSString	*password = [inAccount valueForKey:@"password"];
-    
-    if (!password || [password length] == 0) {
-         password = [self passwordForType:inType forAccount:inAccount name:inName.lowercaseString];
-    }
+	NSString	*password = [self passwordForType:inType forAccount:inAccount name:inName.lowercaseString];
 	
 	if (inOption != AIPromptAlways && password && [password length] != 0) {
 		//Invoke the target right away