[vidalia-svn] r2162: Don't say Tor is running until Tor has a circuit either. Unt (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-02 05:51:06 -0500 (Sun, 02 Dec 2007)
New Revision: 2162

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
Log:
 r2205@lysithea:  edmanm | 2007-12-02 05:50:57 -0500
 Don't say Tor is running until Tor has a circuit either. Until then, Tor is
 "starting up."



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

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-12-02 09:55:19 UTC (rev 2161)
+++ trunk/src/gui/mainwindow.cpp	2007-12-02 10:51:06 UTC (rev 2162)
@@ -451,7 +451,6 @@
       
       ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now"));
   } else if (status == Started) {
-      statusText = tr("Tor is running");
       actionText = tr("Stop Tor");
       _startStopAct->setEnabled(true);
       _startStopAct->setText(actionText);
@@ -477,6 +476,7 @@
       ui.lblStartStopTor->setStatusTip(statusText);
       ui.lblStartStopTor->setAnimation(QPixmap(ANIM_PROCESS_WORKING));
   } else if (status == CircuitEstablished) {
+      statusText = tr("Tor is running");
       trayIconFile = IMG_TOR_RUNNING;
       statusIconFile = IMG_TOR_RUNNING_48;
   }