[vidalia-svn] r1254: Do r1253 a step better and reset the ContactInfo if it is cu (trunk/src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-10-01 13:49:16 -0400 (Sun, 01 Oct 2006)
New Revision: 1254

Modified:
   trunk/src/config/serversettings.cpp
Log:
Do r1253 a step better and reset the ContactInfo if it is currently
the default value, too.


Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2006-10-01 07:34:28 UTC (rev 1253)
+++ trunk/src/config/serversettings.cpp	2006-10-01 17:49:16 UTC (rev 1254)
@@ -232,11 +232,12 @@
     VidaliaSettings::value(SETTING_SERVER_CONTACT).toString().trimmed();
   QString defaultContact =
     VidaliaSettings::defaultValue(SETTING_SERVER_CONTACT).toString();
-  if ((contact != defaultContact) && 
-      (contact != scrub_email_addr(defaultContact))) {
+  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));
+    contact = "";
   }
+  conf.insert(SERVER_CONTACTINFO, scrub_email_addr(contact));
   return conf;
 }