[tor-commits] [torbrowser/maint-2.2] remove the killbrowser patch for Vidalia

[erinn at torproject.org]

commit ff81391c8281f2f9d2f47636df7be7e313d859f9
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Tue Feb 28 14:14:14 2012 +0100

    remove the killbrowser patch for Vidalia
    
    We haven't used it so far, and it doesn't even apply to current Vidalia
---
 build-scripts/INSTALL                              |   11 ----------
 .../vidalia/vidalia-killbrowser.patch              |   22 --------------------
 2 files changed, 0 insertions(+), 33 deletions(-)

diff --git a/build-scripts/INSTALL b/build-scripts/INSTALL
index f435918..cd18032 100644
--- a/build-scripts/INSTALL
+++ b/build-scripts/INSTALL
@@ -423,17 +423,6 @@ Then run:
  > cmake -G "MinGW Makefiles" .
  > mingw32-make
 
-Patches for possible future inclusion
-=====================================
-
-A patch to close the Browser when Vidalia exits is in:
- ../src/current-patches/vidalia-killbrowser.patch
-
-This is not yet useful, since killing FirefoxPortable does not cause
-Firefox to exit. This patch has not yet been applied to Vidalia.
-
-Currently this is not being used by the Torbrowser.
-
 Further information
 ===================
 
diff --git a/src/current-patches/vidalia/vidalia-killbrowser.patch b/src/current-patches/vidalia/vidalia-killbrowser.patch
deleted file mode 100644
index 551b391..0000000
--- a/src/current-patches/vidalia/vidalia-killbrowser.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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);
-