[vidalia-svn] r3900: Backport r3899, give it a changelog entry, and give r3885 a (in vidalia/branches/vidalia-0.1: . src/torcontrol src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-26 19:20:39 -0400 (Fri, 26 Jun 2009)
New Revision: 3900

Modified:
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.cpp
   vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.h
   vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
Log:

Backport r3899, give it a changelog entry, and give r3885 a changelog
entry as well.


Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-06-26 23:16:06 UTC (rev 3899)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-06-26 23:20:39 UTC (rev 3900)
@@ -1,3 +1,11 @@
+0.1.14  xx-xxx-2009
+  o Close the TorProcess more quickly after registering for log events, so
+    we avoid displaying duplicate log messages received over Tor's control
+    port and Tor's stdout log. (Ticket #484)
+  o Explicitly set CMAKE_OSX_SYSROOT to the 10.4 SDK rather than expecting
+    the packager to do so when building a Universal binary.
+
+
 0.1.13  25-May-2009
   o Remove an old warning on the relay settings page that running a bridge
     relay requires Tor 0.2.0.8-alpha or newer.

Modified: vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.cpp	2009-06-26 23:16:06 UTC (rev 3899)
+++ vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.cpp	2009-06-26 23:20:39 UTC (rev 3900)
@@ -144,6 +144,15 @@
             || _controlConn->isConnected());
 }
 
+/** Stops reading log messages from the Tor process's stdout. This has no
+ * effect if isVidaliaRunningTor() is false. */
+void
+TorControl::closeTorStdout()
+{
+  if (_torProcess)
+    _torProcess->closeStdout();
+}
+
 /** Called when Tor has printed a log message to stdout. */
 void
 TorControl::onLogStdout(QString severity, QString message)


Property changes on: vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk/cmake/src/torcontrol/torcontrol.cpp:3745
/vidalia/trunk/src/torcontrol/TorControl.cpp:3776
/vidalia/trunk/src/torcontrol/torcontrol.cpp:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740,3745
   + /vidalia/trunk/cmake/src/torcontrol/torcontrol.cpp:3745
/vidalia/trunk/src/torcontrol/TorControl.cpp:3776,3899
/vidalia/trunk/src/torcontrol/torcontrol.cpp:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740,3745,3884

Modified: vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.h
===================================================================
--- vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.h	2009-06-26 23:16:06 UTC (rev 3899)
+++ vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.h	2009-06-26 23:20:39 UTC (rev 3900)
@@ -61,7 +61,10 @@
   bool isRunning();
   /** Detects if the Tor process is running under Vidalia. */
   bool isVidaliaRunningTor();
-  
+  /** Stops reading log messages from the Tor process's stdout. This has no
+   * effect if isVidaliaRunningTor() is false. */
+  void closeTorStdout();
+
   /** Connect to Tor's control socket */
   void connect(const QHostAddress &address, quint16 port);
   /** Disconnect from Tor's control socket */


Property changes on: vidalia/branches/vidalia-0.1/src/torcontrol/torcontrol.h
___________________________________________________________________
Added: svn:mergeinfo
   + /vidalia/trunk/cmake/src/torcontrol/torcontrol.h:3745
/vidalia/trunk/src/torcontrol/TorControl.h:3899
/vidalia/trunk/src/torcontrol/torcontrol.h:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3643,3732,3740,3745,3754,3884

Modified: vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp	2009-06-26 23:16:06 UTC (rev 3899)
+++ vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp	2009-06-26 23:20:39 UTC (rev 3900)
@@ -1252,6 +1252,10 @@
            "Many of Vidalia's features may be unavailable."))
          + p(errmsg),
       VMessageBox::Ok);
+  } else {
+    /* Stop reading from Tor's stdout immediately, since we successfully
+     * registered for Tor events, including any desired log events. */
+    _torControl->closeTorStdout();
   }
 
   /* Configure UPnP port forwarding if needed */


Property changes on: vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /vidalia/trunk/cmake/src/vidalia/mainwindow.cpp:3745
/vidalia/trunk/src/vidalia/MainWindow.cpp:3899
/vidalia/trunk/src/vidalia/mainwindow.cpp:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3643,3732,3740,3745,3754,3884