[vidalia-svn] r1427: Remove some code we no longer need. (trunk/src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-11-05 02:45:37 -0500 (Sun, 05 Nov 2006)
New Revision: 1427

Modified:
   trunk/src/config/serversettings.cpp
   trunk/src/config/serversettings.h
Log:
Remove some code we no longer need.


Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2006-11-05 07:45:09 UTC (rev 1426)
+++ trunk/src/config/serversettings.cpp	2006-11-05 07:45:37 UTC (rev 1427)
@@ -53,7 +53,6 @@
 #define SETTING_SERVER_CHANGED    "Server/Changed"
 #define SETTING_SERVER_DIRMIRROR  "Server/DirectoryMirror"
 #define SETTING_SERVER_AUTOUPDATE_ADDRESS "Server/AutoUpdateAddress"
-#define SETTING_SERVER_MIDDLEMAN  "Server/Middleman"
 #define SETTING_SERVER_NICKNAME   "Server/"SERVER_NICKNAME
 #define SETTING_SERVER_ORPORT     "Server/"SERVER_ORPORT
 #define SETTING_SERVER_DIRPORT    "Server/"SERVER_DIRPORT
@@ -76,7 +75,6 @@
   setDefault(SETTING_SERVER_ENABLED,    false);
   setDefault(SETTING_SERVER_CHANGED,    false);
   setDefault(SETTING_SERVER_DIRMIRROR,  true);
-  setDefault(SETTING_SERVER_MIDDLEMAN,  true);
   setDefault(SETTING_SERVER_ORPORT,     9001);
   setDefault(SETTING_SERVER_DIRPORT,    9030);
   setDefault(SETTING_SERVER_CONTACT,    "<your@xxxxxxxxx>");
@@ -216,8 +214,8 @@
                          : "0"));
   /* Server Exit Policy */
   conf.insert(SERVER_EXITPOLICY, 
-    (isMiddleman() ? ExitPolicy(ExitPolicy::Middleman).toString()
-                   : VidaliaSettings::value(SETTING_SERVER_EXITPOLICY).toString()));
+    VidaliaSettings::value(SETTING_SERVER_EXITPOLICY).toString());
+  
   /* Server Address */
   conf.insert(SERVER_ADDRESS,      
     VidaliaSettings::value(SETTING_SERVER_ADDRESS).toString());
@@ -383,22 +381,6 @@
   setValue(SETTING_SERVER_DIRMIRROR, mirror);
 }
 
-/** Returns whether this server is a middle-man server. A middle-man server
- * simply relays traffic between other Tor servers. A middle-man server can
- * also act as an entry node for Tor clients. */
-bool
-ServerSettings::isMiddleman()
-{
-  return VidaliaSettings::value(SETTING_SERVER_MIDDLEMAN).toBool();
-}
-
-/** Sets whether this server will act as a middle-man server. */
-void
-ServerSettings::setMiddleman(bool middleman)
-{
-  setValue(SETTING_SERVER_MIDDLEMAN, middleman);
-}
-
 /** Returns the exit policy for this server. */
 ExitPolicy
 ServerSettings::getExitPolicy()

Modified: trunk/src/config/serversettings.h
===================================================================
--- trunk/src/config/serversettings.h	2006-11-05 07:45:09 UTC (rev 1426)
+++ trunk/src/config/serversettings.h	2006-11-05 07:45:37 UTC (rev 1427)
@@ -82,12 +82,6 @@
   void setDirectoryMirror(bool mirror);
   /** Returns true if the server will mirror the directory. */
   bool isDirectoryMirror();
- 
-  /** Sets whether the server will act as a middleman or not. */
-  void setMiddleman(bool middleman);
-  /** Returns true if the server is a middleman server. */
-  bool isMiddleman();
-
   /** Sets the exit policy for this server. */
   void setExitPolicy(ExitPolicy &policy);
   /** Gets the exit policy for this server. */