[vidalia-svn] r2734: If Tor doesn't have bootstrapping events, then update the cu (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-15 00:51:14 -0400 (Sun, 15 Jun 2008)
New Revision: 2734

Modified:
   vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
If Tor doesn't have bootstrapping events, then update the current status string and bump the progress bar along a bit.

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-15 04:20:08 UTC (rev 2733)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-15 04:51:14 UTC (rev 2734)
@@ -82,8 +82,10 @@
 #define STARTUP_PROGRESS_CONNECTING       10
 #define STARTUP_PROGRESS_AUTHENTICATING   20
 #define STARTUP_PROGRESS_BOOTSTRAPPING    30
+#define STARTUP_PROGRESS_CIRCUITBUILD     75
 #define STARTUP_PROGRESS_MAXIMUM          (STARTUP_PROGRESS_BOOTSTRAPPING+100)
 
+
 /** Default constructor. It installs an icon in the system tray area and
  * creates the popup menu associated with that icon. */
 MainWindow::MainWindow()
@@ -1086,6 +1088,13 @@
 
   updateTorStatus(Authenticated);
   
+  /* If Tor doesn't have bootstrapping events, then update the current
+   * status string and bump the progress bar along a bit. */
+  if (_torControl->getTorVersion() < 0x020101) {
+    setStartupProgress(STARTUP_PROGRESS_CIRCUITBUILD,
+                       tr("Connecting to the Tor network"));
+  }
+  
   /* Let people click on their beloved "New Identity" button */
   _newIdentityAct->setEnabled(true);
   ui.lblNewIdentity->setEnabled(true);