[vidalia-svn] r2161: Only turn the onion icon green when Tor has built a circuit. (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-02 04:55:19 -0500 (Sun, 02 Dec 2007)
New Revision: 2161

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
   trunk/src/gui/mainwindow.h
Log:
 r2203@lysithea:  edmanm | 2007-12-02 04:55:11 -0500
 Only turn the onion icon green when Tor has built a circuit.



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

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-12-02 09:34:56 UTC (rev 2160)
+++ trunk/src/gui/mainwindow.cpp	2007-12-02 09:55:19 UTC (rev 2161)
@@ -476,7 +476,7 @@
       ui.lblStartStopTor->setEnabled(false);
       ui.lblStartStopTor->setStatusTip(statusText);
       ui.lblStartStopTor->setAnimation(QPixmap(ANIM_PROCESS_WORKING));
-  } else if (status == Authenticated) {
+  } else if (status == CircuitEstablished) {
       trayIconFile = IMG_TOR_RUNNING;
       statusIconFile = IMG_TOR_RUNNING_48;
   }
@@ -939,7 +939,7 @@
 void
 MainWindow::circuitEstablished()
 {
-  vNotice("Tor has established a circuit.");
+  updateTorStatus(CircuitEstablished);
 }
 
 /** Creates and displays Vidalia's About dialog. */
@@ -1038,6 +1038,7 @@
     case Started:   return "Started";
     case Authenticating:  return "Authenticating";
     case Authenticated:   return "Authenticated";
+    case CircuitEstablished: return "Circuit Established";
     default: break;
   }
   return "Unknown";

Modified: trunk/src/gui/mainwindow.h
===================================================================
--- trunk/src/gui/mainwindow.h	2007-12-02 09:34:56 UTC (rev 2160)
+++ trunk/src/gui/mainwindow.h	2007-12-02 09:55:19 UTC (rev 2161)
@@ -126,7 +126,8 @@
     Starting,   /**< Tor is in the process of starting. */
     Started,    /**< Tor is currently running. */
     Authenticating, /**< Vidalia is authenticating to Tor. */
-    Authenticated   /**< Vidalia has authenticated to Tor. */
+    Authenticated,  /**< Vidalia has authenticated to Tor. */
+    CircuitEstablished /**< Tor has built a circuit. */
   };
   /** Create the actions on the tray menu or menubar */
   void createActions();