[vidalia-svn] r2426: made the errmsg string optional, thanks to edmanm ;) (in vidalia/branches/hidden-services/src: torcontrol vidalia/config)

[borkdomenik@xxxxxxxxxxxxxxxxxxx]

Author: borkdomenik
Date: 2008-03-20 18:31:46 -0400 (Thu, 20 Mar 2008)
New Revision: 2426

Modified:
   vidalia/branches/hidden-services/src/torcontrol/torcontrol.h
   vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp
Log:
made the errmsg string optional, thanks to edmanm ;)

Modified: vidalia/branches/hidden-services/src/torcontrol/torcontrol.h
===================================================================
--- vidalia/branches/hidden-services/src/torcontrol/torcontrol.h	2008-03-20 17:01:14 UTC (rev 2425)
+++ vidalia/branches/hidden-services/src/torcontrol/torcontrol.h	2008-03-20 22:31:46 UTC (rev 2426)
@@ -146,7 +146,7 @@
   QVariant getConf(const QString &key, QString *errmsg = 0);
   /** Sends a GETCONF message to Tor with the single key and returns a QString 
    * containing the value returned by Tor */
-  QString getHiddenServiceConf(const QString &key, QString *errmsg);
+  QString getHiddenServiceConf(const QString &key, QString *errmsg = 0);
   
   /** Asks Tor to save the current configuration to its torrc */
   bool saveConf(QString *errmsg = 0);

Modified: vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp	2008-03-20 17:01:14 UTC (rev 2425)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp	2008-03-20 22:31:46 UTC (rev 2426)
@@ -117,8 +117,7 @@
 QString
 ServiceSettings::getHiddenServiceDirectories()
 {
-	QString *errmsg;
-	QString value =  _torControl->getHiddenServiceConf("hiddenserviceoptions", errmsg);   
+	QString value =  _torControl->getHiddenServiceConf("hiddenserviceoptions");   
 	return value;  
 }