Changeset 2328

Timestamp:

01/27/08 13:59:29 (10 months ago)

Author:

edmanm

Message:

r89@lysithea: edmanm | 2008-01-27 13:58:58 -0500
Add a 'ProxyExecutableArguments?' configuration option to specify command line
arguments to be used when launching ProxyExecutable?. Patch from Steven J.
Murdoch <http://www.cl.cam.ac.uk/users/sjm217/>.

Location:

vidalia/trunk/src/vidalia

Files:

• config/vidaliasettings.cpp (modified) (4 diffs)
• config/vidaliasettings.h (modified) (2 diffs)
• mainwindow.cpp (modified) (1 diff)

vidalia/trunk/src/vidalia/config/vidaliasettings.cpp

@@ -45 +45 @@
 #define SETTING_BROWSER_EXECUTABLE  "BrowserExecutable"
 #define SETTING_PROXY_EXECUTABLE  "ProxyExecutable"
+#define SETTING_PROXY_EXECUTABLE_ARGUMENTS  "ProxyExecutableArguments"
 
 #if defined(Q_OS_WIN32)
@@ -77 +78 @@
   setDefault(SETTING_BROWSER_EXECUTABLE, "");
   setDefault(SETTING_PROXY_EXECUTABLE, "");
+  setDefault(SETTING_PROXY_EXECUTABLE_ARGUMENTS, QStringList());
 }
 
@@ -197 +199 @@
 }
 
-/** Sets the location and name of the proxy server executable to the given string.
- * If set to the empty string, the proxy will not be started. */
+/** Sets the location and name of the proxy server executable to the given
+ * string. If set to the empty string, the proxy will not be started. */
 void
 VidaliaSettings::setProxyExecutable(const QString &proxyExecutable)
@@ -204 +206 @@
   setValue(SETTING_PROXY_EXECUTABLE, proxyExecutable);
 }
+
+/** Returns a list containing additional command line arguments to be passed
+ * to ProxyExecutable */
+QStringList
+VidaliaSettings::getProxyExecutableArguments() const
+{
+  return value(SETTING_PROXY_EXECUTABLE_ARGUMENTS).toStringList();
+}
+
+/** Sets the additional arguments to be passed to Proxy Executable */
+void
+VidaliaSettings::setProxyExecutableArguments(const QStringList
+                                             &proxyExecutableArguments)
+{
+  setValue(SETTING_PROXY_EXECUTABLE_ARGUMENTS, proxyExecutableArguments);
+}
+

vidalia/trunk/src/vidalia/config/vidaliasettings.h

@@ -76 +76 @@
    * executable name. */
   QString getBrowserExecutable() const;
-  /** Sets the location and name of the web browser executable to the given string.
-   * If set to the empty string, the browser will not be started. */
+  /** Sets the location and name of the web browser executable to the given
+   * string. If set to the empty string, the browser will not be started. */
   void setBrowserExecutable(const QString &browserExecutable);
 
@@ -84 +84 @@
   QString getProxyExecutable() const;
 
-  /** Sets the location and name of the proxy server executable to the given string.
-   * If set to the empty string, the proxy will not be started. */
+  /** Sets the location and name of the proxy server executable to the given
+   * string. If set to the empty string, the proxy will not be started. */
   void setProxyExecutable(const QString &proxyExecutable);
+
+  /** Returns a list containing additional command line arguments to be
+   * passed to ProxyExecutable */
+  QStringList getProxyExecutableArguments() const;
+
+  /** Sets the additional arguments to be passed to Proxy Executable */
+  void setProxyExecutableArguments(const QStringList &proxyExecutableArguments);
 };
 

vidalia/trunk/src/vidalia/mainwindow.cpp

@@ -460 +460 @@
   
   if (!executable.isEmpty())
-    _proxyProcess->start(executable, QStringList());
+    _proxyProcess->start(executable, settings.getProxyExecutableArguments());
 }