[vidalia-svn] r3556: Backport r3235. (in vidalia/branches/vidalia-0.1: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-02-19 13:49:23 -0500 (Thu, 19 Feb 2009)
New Revision: 3556

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/CMakeLists.txt
   vidalia/branches/vidalia-0.1/src/vidalia/config/servicesettings.cpp
Log:

Backport r3235.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3482,3504-3505,3524-3526,3528,3530
   + /vidalia/trunk:3235,3482,3504-3505,3524-3526,3528,3530

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-02-18 19:43:08 UTC (rev 3555)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-02-19 18:49:23 UTC (rev 3556)
@@ -1,3 +1,8 @@
+0.1.12  xx-xxx-2009
+  o Fix a bug in the hidden service settings configuration class that
+    could lead to compile errors in Visual Studio and on IRIX.
+
+
 0.1.11  16-Feb-2009
   o Remove support for configuring Tor's User and Group options in the 
     Advanced settings page.

Modified: vidalia/branches/vidalia-0.1/CMakeLists.txt
===================================================================
--- vidalia/branches/vidalia-0.1/CMakeLists.txt	2009-02-18 19:43:08 UTC (rev 3555)
+++ vidalia/branches/vidalia-0.1/CMakeLists.txt	2009-02-19 18:49:23 UTC (rev 3556)
@@ -13,8 +13,8 @@
 
 set(VER_MAJOR   "0")
 set(VER_MINOR   "1")
-set(VER_PATCH   "11")
-set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}")
+set(VER_PATCH   "12")
+set(VERSION     "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-svn")
 message(STATUS  "Configuring Vidalia ${VERSION}")
 project(Vidalia)
 

Modified: vidalia/branches/vidalia-0.1/src/vidalia/config/servicesettings.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/config/servicesettings.cpp	2009-02-18 19:43:08 UTC (rev 3555)
+++ vidalia/branches/vidalia-0.1/src/vidalia/config/servicesettings.cpp	2009-02-19 18:49:23 UTC (rev 3556)
@@ -71,9 +71,9 @@
     if(enabledS.compare("x1") == 0) {
       enabled = true;
     }
-    Service s(address, virtualPort, physAddrPort, serviceDir, enabled);
-    s.setAdditionalServiceOptions(additionalData);
-    services.addService(s);
+    Service service(address, virtualPort, physAddrPort, serviceDir, enabled);
+    service.setAdditionalServiceOptions(additionalData);
+    services.addService(service);
   }
   return services;
 }