[vidalia-svn] r2973: bugfix on HidServAuth with more than one service! (vidalia/branches/hidden-services/src/vidalia/config)

[borkdomenik@xxxxxxxxxxxxxxxxxxx]

Author: borkdomenik
Date: 2008-08-16 11:30:13 -0400 (Sat, 16 Aug 2008)
New Revision: 2973

Modified:
   vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui
   vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp
Log:
bugfix on HidServAuth with more than one service!

Modified: vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui	2008-08-16 14:47:29 UTC (rev 2972)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui	2008-08-16 15:30:13 UTC (rev 2973)
@@ -530,7 +530,7 @@
          <item row="2" column="1" >
           <widget class="QToolButton" name="copyServiceAuthBtn" >
            <property name="toolTip" >
-            <string>Copy authorization data of selected service to clipboard</string>
+            <string>Copy onion-address of selected service to clipboard</string>
            </property>
            <property name="text" >
             <string/>

Modified: vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp	2008-08-16 14:47:29 UTC (rev 2972)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp	2008-08-16 15:30:13 UTC (rev 2973)
@@ -120,14 +120,18 @@
 {
   QStringList serviceAuthdataList;
   QString torConfString;
+  QString *errmsg;
   if(list.size() > 0) {
+    bool first = true;
     foreach(ServiceAuthorizationData tempService, list) {
       serviceAuthdataList << tempService.toString();
       //HidServAuth <onion address> <cookie> <optional_comment>
-      torConfString.append(tempService.authdata());
-      torConfString.append(" "+tempService.identification());
-      torControl()->setConf("HidServAuth", torConfString);
+      torConfString.append("HidServAuth=");
+      torConfString.append(string_escape(tempService.authdata()+" "+tempService.identification()));
+      torConfString.append(" ");
     }
+    torConfString.remove(torConfString.length()-1, 1);
+    torControl()->setConf(torConfString, errmsg);
   }
   setValue(SETTING_TOR_CONSUMED_SERVICES, serviceAuthdataList);
 }