[vidalia-svn] r4013: Fixed the settings function and added some code for TBB (in vidalia/branches/extension-api/src/plugins: . TorBrowserBundlePlugin)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-08-05 20:42:54 -0400 (Wed, 05 Aug 2009)
New Revision: 4013

Modified:
   vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp
   vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h
   vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp
Log:
Fixed the settings function and added some code for TBB

Modified: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp	2009-08-06 00:22:12 UTC (rev 4012)
+++ vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.cpp	2009-08-06 00:42:54 UTC (rev 4013)
@@ -16,10 +16,14 @@
 
 #include "TorBrowserBundlePlugin.h"
 
+#include <QProcess>
+#include <QSettings>
 #include <QString>
 
 TorBrowserBundlePlugin::TorBrowserBundlePlugin()
 {
+  qDebug() << "TBB IS ALIVE!\n";
+
   /* Listen for the TorStarted() signal to begin TBB */
   connect(_pluginManager, SIGNAL(torStarted()), this, SLOT(start()));
 }
@@ -49,6 +53,22 @@
 void
 TorBrowserBundlePlugin::start()
 {
+  QSettings* tbbSettings = VidaliaPluginInterface::settings();
+
+  QString firefoxExecutable = tbbSettings->value("firefox_executable",
+                                                 QString()).toString();
+
+  QString pidginExecutable = tbbSettings->value("pidgin_executable",
+                                                QString()).toString();
+
+  /* *** TODO: Arguments? *** */
+
+  /* If either is null, don't start tbb */
+  if (pidginExecutable.isNull() || firefoxExecutable.isNull()) {
+    return;
+  }
+
+  delete tbbSettings;
 }
 
 Q_EXPORT_PLUGIN2(torbrowserbundleplugin, TorBrowserBundlePlugin)

Modified: vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h
===================================================================
--- vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h	2009-08-06 00:22:12 UTC (rev 4012)
+++ vidalia/branches/extension-api/src/plugins/TorBrowserBundlePlugin/TorBrowserBundlePlugin.h	2009-08-06 00:42:54 UTC (rev 4013)
@@ -19,6 +19,7 @@
 
 #include <plugins/VidaliaPluginInterface.h>
 
+class QProcess;
 class QString;
 
 class TorBrowserBundlePlugin : public VidaliaPluginInterface
@@ -37,6 +38,10 @@
 private slots:
   /** When Tor comes online and building and circuits, this starts TBB */
   void start();
+
+private:
+  QProcess* _firefoxProcess;
+  QProcess* _pidginProcess;
 };
 
 #endif

Modified: vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp	2009-08-06 00:22:12 UTC (rev 4012)
+++ vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp	2009-08-06 00:42:54 UTC (rev 4013)
@@ -30,7 +30,24 @@
 QSettings*
 VidaliaPluginInterface::settings() const
 {
-  QSettings* setting = new QSettings(dataDirectory(), QSettings::IniFormat);
+  QString configurationName = dataDirectory();
+
+#if defined(Q_OS_WIN)
+  configurationName += QString("\");
+#else
+  configurationName += QString("/");
+#endif
+
+  configurationName += id();
+
+#if defined(Q_OS_WIN)
+  configurationName += QString("\");
+#else
+  configurationName += QString("/");
+#endif
+
+  configurationName += id() + ".conf";
+  QSettings* setting = new QSettings(configurationName, QSettings::IniFormat);
   return setting;
 }