[vidalia-svn] r3748: Backport r3746 and give it a changelog entry. (in vidalia/branches/vidalia-0.1: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-04-30 15:13:03 -0400 (Thu, 30 Apr 2009)
New Revision: 3748

Modified:
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp
Log:

Backport r3746 and give it a changelog entry.


Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-04-30 19:07:57 UTC (rev 3747)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-04-30 19:13:03 UTC (rev 3748)
@@ -10,6 +10,9 @@
     and lrelease executables. Recent versions of CMake decided to use the
     same variable name, which was stomping on mine, resulting in the wrong
     lupdate and lrelease executables being used.
+  o Use the TorProcess subclass of QProcess for launching Tor when hashing
+    a control password so we can take advantage of its PATH+=:/usr/sbin
+    trick on Debian there too.
 
 
 0.1.12  16-Mar-2009

Modified: vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp	2009-04-30 19:07:57 UTC (rev 3747)
+++ vidalia/branches/vidalia-0.1/src/vidalia/config/torsettings.cpp	2009-04-30 19:13:03 UTC (rev 3748)
@@ -16,6 +16,7 @@
 
 #include <QDir>
 #include <QProcess>
+#include <torprocess.h>
 #include <crypto.h>
 #include <vidalia.h>
 
@@ -299,7 +300,7 @@
 TorSettings::hashPassword(const QString &password)
 {
   TorSettings settings;
-  QProcess tor;
+  TorProcess tor;
   QString dataDirectory, line;
   QStringList args;