[vidalia-svn] r1915: Let the control socket log the control socket's status (logi (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-09-05 23:51:44 -0400 (Wed, 05 Sep 2007)
New Revision: 1915

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
   trunk/src/gui/mainwindow.h
Log:
 r2132@adrastea:  edmanm | 2007-09-05 23:50:12 -0400
 Let the control socket log the control socket's status (logically) and don't
 lump it together with Tor's status.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2132] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-09-06 03:51:37 UTC (rev 1914)
+++ trunk/src/gui/mainwindow.cpp	2007-09-06 03:51:44 UTC (rev 1915)
@@ -570,8 +570,6 @@
 void
 MainWindow::connectFailed(QString errmsg)
 {
-  updateTorStatus(Disconnected);
-
   /* Ok, ok. It really isn't going to connect. I give up. */
   int response = VMessageBox::warning(this, 
                    tr("Error Connecting to Tor"), p(errmsg),
@@ -681,7 +679,6 @@
 void
 MainWindow::connected()
 {
-  updateTorStatus(Connected);
   authenticate();
 }
 
@@ -689,7 +686,6 @@
 void
 MainWindow::disconnect()
 {
-  updateTorStatus(Disconnecting);
   _torControl->disconnect();
 }
 
@@ -697,7 +693,6 @@
 void
 MainWindow::disconnected()
 {
-  updateTorStatus(Disconnected);
   if (!_isVidaliaRunningTor) {
     /* If we didn't start our own Tor process, interpret losing the control
      * connection as "Tor is stopped". */
@@ -1015,10 +1010,6 @@
     case Stopped:   return "Stopped";
     case Starting:  return "Starting";
     case Started:   return "Started";
-    case Connecting:  return "Connecting";
-    case Connected:   return "Connected";
-    case Disconnecting: return "Disconnecting";
-    case Disconnected:  return "Disconnected";
     case Authenticating:  return "Authenticating";
     case Authenticated:   return "Authenticated";
     default: break;

Modified: trunk/src/gui/mainwindow.h
===================================================================
--- trunk/src/gui/mainwindow.h	2007-09-06 03:51:37 UTC (rev 1914)
+++ trunk/src/gui/mainwindow.h	2007-09-06 03:51:44 UTC (rev 1915)
@@ -121,10 +121,6 @@
     Stopped,    /**< Tor is not running. */
     Starting,   /**< Tor is in the process of starting. */
     Started,    /**< Tor is currently running. */
-    Connecting, /**< Vidalia is connecting to Tor. */
-    Connected,  /**< Vidalia is connected to Tor. */
-    Disconnecting,  /**< Vidalia is disconnecting from Tor. */
-    Disconnected,   /**< Vidalia is disconnected from Tor. */
     Authenticating, /**< Vidalia is authenticating to Tor. */
     Authenticated   /**< Vidalia has authenticated to Tor. */
   };