[vidalia-svn] r2049: Whoops. I moved this code out into its own function, but for (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-20 19:17:46 -0400 (Sat, 20 Oct 2007)
New Revision: 2049

Modified:
   trunk/
   trunk/src/config/torsettings.cpp
Log:
 r2159@lysithea:  edmanm | 2007-10-20 19:17:41 -0400
 Whoops. I moved this code out into its own function, but forgot to replace it
 with a call to that new function.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2159] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/config/torsettings.cpp
===================================================================
--- trunk/src/config/torsettings.cpp	2007-10-20 23:01:59 UTC (rev 2048)
+++ trunk/src/config/torsettings.cpp	2007-10-20 23:17:46 UTC (rev 2049)
@@ -336,18 +336,9 @@
         type = PasswordAuth;
     }
   }
-  if (type == UnknownAuth) {
-    QString str = localValue(SETTING_AUTH_METHOD).toString();
-    if (str == toString(NullAuth))
-      type = NullAuth;
-    else if (str == toString(PasswordAuth))
-      type = PasswordAuth;
-    else if (str == toString(CookieAuth))
-      type = CookieAuth;
-    else
-      type = DEFAULT_AUTH_METHOD;
-  }
-  return type;
+  if (type == UnknownAuth)
+    type = toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());
+  return (type == UnknownAuth ? DEFAULT_AUTH_METHOD : type);
 }
 
 /** Sets the authentication method used when starting Tor to <b>method</b>. */