[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2141: Add a MainWindow::circuitEstablished() method from which Ste (in trunk: . src/gui)



Author: edmanm
Date: 2007-11-26 16:10:46 -0500 (Mon, 26 Nov 2007)
New Revision: 2141

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
   trunk/src/gui/mainwindow.h
Log:
 r2162@lysithea:  edmanm | 2007-11-26 16:10:37 -0500
 Add a MainWindow::circuitEstablished() method from which Steven can call his
 Firefox-launching stuff. For now, this is simply called when we authenticate to a
 running Tor, but will eventually be tied to the CIRCUIT_ESTABLISHED status
 event.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2162] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-11-26 18:40:59 UTC (rev 2140)
+++ trunk/src/gui/mainwindow.cpp	2007-11-26 21:10:46 UTC (rev 2141)
@@ -465,6 +465,10 @@
   } else if (status == Authenticated) {
       trayIconFile = IMG_TOR_RUNNING;
       statusIconFile = IMG_TOR_RUNNING_48;
+
+      /* XXX: This function should be called when Tor has actually established
+       * a circuit, not just when we've connected to Tor. */
+      circuitEstablished();
   }
 
   /* Update the tray icon */
@@ -916,6 +920,15 @@
   return QByteArray();
 }
 
+/** Called when Tor has successfully established a circuit.
+ * TODO: Actually call this when Tor establishes a circuit, instead of simply
+ * when we've connected to a running Tor. */
+void
+MainWindow::circuitEstablished()
+{
+
+}
+
 /** Creates and displays Vidalia's About dialog. */
 void
 MainWindow::showAboutDialog()

Modified: trunk/src/gui/mainwindow.h
===================================================================
--- trunk/src/gui/mainwindow.h	2007-11-26 18:40:59 UTC (rev 2140)
+++ trunk/src/gui/mainwindow.h	2007-11-26 21:10:46 UTC (rev 2141)
@@ -148,6 +148,8 @@
    * depending on the current platform. <b>cookiePath</b> can point to either
    * a cookie file or a directory containing the cookie file. */
   QByteArray loadControlCookie(QString cookiePath = QString());
+  /** Called when Tor has successfully established a circuit. */
+  void circuitEstablished();
 
   /** The current status of Tor. */
   TorStatus _status;