[vidalia-svn] r1253: Don't set a server's contact information if the user didn't (trunk/src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-10-01 03:34:28 -0400 (Sun, 01 Oct 2006)
New Revision: 1253

Modified:
   trunk/src/config/serversettings.cpp
Log:
Don't set a server's contact information if the user didn't change it from the
meaningless default value.


Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2006-10-01 07:22:25 UTC (rev 1252)
+++ trunk/src/config/serversettings.cpp	2006-10-01 07:34:28 UTC (rev 1253)
@@ -229,9 +229,14 @@
     
   /* Server Contact Information */
   QString contact = 
-    VidaliaSettings::value(SETTING_SERVER_CONTACT).toString();
-  conf.insert(SERVER_CONTACTINFO, scrub_email_addr(contact));
-  
+    VidaliaSettings::value(SETTING_SERVER_CONTACT).toString().trimmed();
+  QString defaultContact =
+    VidaliaSettings::defaultValue(SETTING_SERVER_CONTACT).toString();
+  if ((contact != defaultContact) && 
+      (contact != scrub_email_addr(defaultContact))) {
+    /* Only set the contact info if they put something non-default there */
+    conf.insert(SERVER_CONTACTINFO, scrub_email_addr(contact));
+  }
   return conf;
 }