[or-cvs] r12800: Add code for exiting Firefox from Vidalia Update TODO (in torpedo/trunk: build-scripts docs)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2007-12-13 10:24:57 -0500 (Thu, 13 Dec 2007)
New Revision: 12800

Added:
   torpedo/trunk/build-scripts/vidalia-killbrowser.patch
Modified:
   torpedo/trunk/docs/TODO
Log:
Add code for exiting Firefox from Vidalia
Update TODO

Added: torpedo/trunk/build-scripts/vidalia-killbrowser.patch
===================================================================
--- torpedo/trunk/build-scripts/vidalia-killbrowser.patch	                        (rev 0)
+++ torpedo/trunk/build-scripts/vidalia-killbrowser.patch	2007-12-13 15:24:57 UTC (rev 12800)
@@ -0,0 +1,22 @@
+Index: src/vidalia/mainwindow.cpp
+===================================================================
+--- src/vidalia/mainwindow.cpp	(revision 2213)
++++ src/vidalia/mainwindow.cpp	(working copy)
+@@ -260,6 +260,17 @@
+     _torControl->stop();
+   }
+ 
++  if (_browserProcess->state() != QProcess::NotRunning) {
++    /* The browser is still running -- ask it to close.
++       Currently this appears to have no affect, probably because killing
++       FirefoxPortable doesn't kill firefox.exe. Switching to kil() did
++       not help either. Once Vidalia starts firefox.exe directly this should work. */
++    // Ignore the finished signal
++    QObject::disconnect(_browserProcess, SIGNAL(finished(int, QProcess::ExitStatus)), 0, 0);
++    // Send the close request
++    _browserProcess->terminate();
++  }
++
+   /* Disconnect all of the TorControl object's signals */
+   QObject::disconnect(_torControl, 0, 0, 0);
+ 

Modified: torpedo/trunk/docs/TODO
===================================================================
--- torpedo/trunk/docs/TODO	2007-12-13 05:47:08 UTC (rev 12799)
+++ torpedo/trunk/docs/TODO	2007-12-13 15:24:57 UTC (rev 12800)
@@ -16,8 +16,13 @@
 - Make Vidalia show some evidence of activity while it is starting Tor
 
 - Also make Vidalia show what percentage progress Tor has made in
-  building a circuit (needs Tor modifications)
+  building a circuit (needs Tor to send events while startup is proceeding)
 
+- Make Vidalia kill Firefox when it exits. Currently Vidalia
+  terminates the process, but killing FirefoxPortable does not end Firefox.
+  Either we could kill firefox.exe directly, or wait until Vidalia
+  launches Firefox.
+
 Firefox modifications
 ---------------------
 
@@ -80,12 +85,6 @@
   dangers when submitting forms to non-HTTPS URLs)
 [low priority]
 
-- Add bookmarks that will help people understand tor better
-  - The Tor frontpage
-  - A hidden service of some sort?
-  - A "check if your Tor is leaking" page
-[low priority]
-
 General
 -------
 
@@ -110,17 +109,11 @@
 - Come up with a new name
 [high priority]
 
-- Build Tor myself
-[high priority]
-
 - What should the installer look like (should it have the Tor logo)?
   We need to be clear in the documentation about the difference between
   the installer and the actual bundle
 [mid priority]
 
-- Add version numbers to builds
-[mid priority]
-
 - Let us build a Chinese-language and Farsi-language version. These
   would have Vidalia and Firefox configured to use these languages
   by default.
@@ -139,6 +132,28 @@
 
 - How much of a worry is wearing out the flash
 
+Done
+====
+
+[ Done: 2007-12-12 ]
+- Add bookmarks that will help people understand tor better
+  - The Tor frontpage
+  - A hidden service of some sort?
+  - A "check if your Tor is leaking" page
+[low priority]
+
+[ Done: 2007-12-12 ]
+- Build Tor myself
+[high priority]
+
+[ Done: 2007-12-12 ]
+- Add version numbers to builds
+[mid priority]
+
+[ Done: 2007-12-13 -- I think users should be able to stop (and
+  restart Tor) without exiting Firefox. I've added the code to kill
+  the browser when Vidalia exits but this won't work until
+  PortableFirefox is replaced with Vidalia. ]
 - What to do when user clicks "Stop Tor" or exits Vidalia: Don't let them do it?
   Kill Firefox? Show a helpful message?
   We could make Vidalia change its button labels when it has launched Firefox