[vidalia-svn] r1718: If Tor is already running when Vidalia is started, update ou (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-04-20 22:27:34 -0400 (Fri, 20 Apr 2007)
New Revision: 1718

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
Log:
 r1811@adrastea:  edmanm | 2007-04-20 22:21:10 -0400
 If Tor is already running when Vidalia is started, update our status icon and
 such before trying to connect to Tor. Otherwise, users would see a button to 
 'Start Tor', but when they click it the button would really try to stop Tor
 and yell at you if your pre-existing Tor was running a server.



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

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-04-19 12:56:26 UTC (rev 1717)
+++ trunk/src/gui/mainwindow.cpp	2007-04-21 02:27:34 UTC (rev 1718)
@@ -139,8 +139,11 @@
   connect(vApp, SIGNAL(shutdown()), this, SLOT(shutdown()));
 
   if (_torControl->isRunning()) {
+    /* Tor may be already running, but we still need to connect to it. So,
+     * update our status now. */ 
+    updateTorStatus(Starting);
     /* Tor was already running */
-    this->started();
+    started();
   } else if (settings.runTorAtStart()) {
     /* If we're supposed to start Tor when Vidalia starts, then do it now */
     start();