[vidalia-svn] r1956: Remove an unused variable and correct a comment. (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-09-29 16:59:10 -0400 (Sat, 29 Sep 2007)
New Revision: 1956

Modified:
   trunk/
   trunk/src/config/serversettings.cpp
Log:
 r1975@lysithea:  edmanm | 2007-09-29 16:53:23 -0400
 Remove an unused variable and correct a comment.



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

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-09-29 20:59:05 UTC (rev 1955)
+++ trunk/src/config/serversettings.cpp	2007-09-29 20:59:10 UTC (rev 1956)
@@ -292,12 +292,11 @@
 }
 
 /** Returns true if Tor is currently configured to run as a Tor server. If Tor
- * was started with a specific torrc, we will ask Tor whether that torrc told
- * it to be a server. Otherwise, we use our local settings. */
+ * is running, we will check whether it has an ORPort and Nickname defined.
+ * Otherwise, we will use our saved settings. */
 bool
 ServerSettings::isServerEnabled()
 {
-  TorSettings settings;
   QHash<QString,QString> confValues;
   if (_torControl->isConnected() && !changedSinceLastApply()) {
     confValues.insert(SERVER_ORPORT, "");