[Pkg-privacy-commits] [torbrowser-launcher] 01/02: d/patches: Add patch 0017 and 0018 to fix the extra dialog issue

[Roger Shimizu]

This is an automated email from the git hooks/post-receive script.

rosh pushed a commit to tag debian/0.3.0_dev-1_exp1
in repository torbrowser-launcher.

commit 419e5f78d0aceb144a9aa835f81e1fe98eac69d9
Author: Roger Shimizu <rosh at debian.org>
Date:   Wed Mar 28 20:07:29 2018 +0900

    d/patches: Add patch 0017 and 0018 to fix the extra dialog issue
---
 debian/changelog                                   |  1 +
 .../0017-show-gui-only-if-tbb-not-installed.patch  | 60 ++++++++++++++++++++++
 .../0018-remove-double-common-assignment.patch     | 23 +++++++++
 debian/patches/series                              |  2 +
 4 files changed, 86 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8d39e1d..f5c29c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ torbrowser-launcher (0.3.0~dev-1~exp1) UNRELEASED; urgency=medium
     - Improved python style with flake8
   * debian/patches:
     - Refresh patches.
+    - Add patch 0017 and 0018 to fix the extra dialog issue.
   * debian/control:
     - Update Build-Depends list to python3 series.
     - Update Depends list to match current python3 implementation.
diff --git a/debian/patches/0017-show-gui-only-if-tbb-not-installed.patch b/debian/patches/0017-show-gui-only-if-tbb-not-installed.patch
new file mode 100644
index 0000000..8533364
--- /dev/null
+++ b/debian/patches/0017-show-gui-only-if-tbb-not-installed.patch
@@ -0,0 +1,60 @@
+From: troubadoour <trobador at riseup.net>
+Date: Tue, 27 Mar 2018 18:19:26 -0400
+Subject: show gui only if tbb not installed
+Origin: https://github.com/troubadoour/torbrowser-launcher/commit/1402015487db5559847492ca294ac6c895245dca
+
+---
+ torbrowser_launcher/__init__.py | 29 ++++++++++++++++-------------
+ 1 file changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
+index ce542a4..f8b66da 100644
+--- a/torbrowser_launcher/__init__.py
++++ b/torbrowser_launcher/__init__.py
+@@ -37,6 +37,8 @@ from .common import Common, SHARE
+ from .settings import Settings
+ from .launcher import Launcher
+ 
++# Allow ctrl-c to work
++signal.signal(signal.SIGINT, signal.SIG_DFL)
+ 
+ class Application(QtWidgets.QApplication):
+     """
+@@ -76,23 +78,24 @@ def main():
+     if settings:
+         # Settings mode
+         gui = Settings(common, app)
++        gui.show()
++        sys.exit(app.exec_())
++
+     else:
+         # Launcher mode
+         gui = Launcher(common, app, url_list)
+ 
+-    # Center the window
+-    desktop = app.desktop()
+-    window_size = gui.size()
+-    gui.move(
+-        (desktop.width() - window_size.width()) / 2,
+-        (desktop.height() - window_size.height()) / 2
+-    )
+-    gui.show()
+-
+-    # Allow ctrl-c to work
+-    signal.signal(signal.SIGINT, signal.SIG_DFL)
+-
+-    sys.exit(app.exec_())
++        # Show gui only if not installed
++        common = common
++        if not common.settings['installed']:
++            desktop = app.desktop()
++            window_size = gui.size()
++            gui.move(
++                (desktop.width() - window_size.width()) / 2,
++                (desktop.height() - window_size.height()) / 2
++            )
++            gui.show()
++            sys.exit(app.exec_())
+ 
+ 
+ if __name__ == "__main__":
diff --git a/debian/patches/0018-remove-double-common-assignment.patch b/debian/patches/0018-remove-double-common-assignment.patch
new file mode 100644
index 0000000..3a9c567
--- /dev/null
+++ b/debian/patches/0018-remove-double-common-assignment.patch
@@ -0,0 +1,23 @@
+From: troubadoour <trobador at riseup.net>
+Date: Wed, 28 Mar 2018 03:52:42 -0400
+Subject: remove double 'common' assignment
+Origin: https://github.com/troubadoour/torbrowser-launcher/commit/63646cb69521d40bf25484831d58bcf691f71cca
+
+---
+ torbrowser_launcher/__init__.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
+index f8b66da..72f7937 100644
+--- a/torbrowser_launcher/__init__.py
++++ b/torbrowser_launcher/__init__.py
+@@ -85,8 +85,7 @@ def main():
+         # Launcher mode
+         gui = Launcher(common, app, url_list)
+ 
+-        # Show gui only if not installed
+-        common = common
++        # Show gui only if tbb not installed
+         if not common.settings['installed']:
+             desktop = app.desktop()
+             window_size = gui.size()
diff --git a/debian/patches/series b/debian/patches/series
index 5c154ed..4ac44b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,5 @@
 0014-AppArmor-support-some-of-the-included-pluggable-tran.patch
 0015-AppArmor-remove-boilerplate-from-local-override-file.patch
 0016-Remove-apparmor-local-path-from-setup.py.patch
+0017-show-gui-only-if-tbb-not-installed.patch
+0018-remove-double-common-assignment.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git