[caja-dropbox] 03/04: debian/patches: Add 2003_execute_via_dbus_launch.patch. Execute via dbus-launch to ensure the tray icon works. Closes (LP: #1559249)

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch master
in repository caja-dropbox.

commit 8fd8e8efa1cbfe7c89caf6aa0e2cd886cbe9dab5
Author: Martin Wimpress <code at flexion.org>
Date:   Tue Apr 12 12:58:26 2016 +0100

    debian/patches: Add 2003_execute_via_dbus_launch.patch. Execute via dbus-launch to ensure the tray icon works. Closes (LP: #1559249)
---
 debian/patches/2003_execute_via_dbus_launch.patch | 23 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/2003_execute_via_dbus_launch.patch b/debian/patches/2003_execute_via_dbus_launch.patch
new file mode 100644
index 0000000..80fb338
--- /dev/null
+++ b/debian/patches/2003_execute_via_dbus_launch.patch
@@ -0,0 +1,23 @@
+Description: Execute via dbus-launch to ensure the tray icon works. Closes (LP: #1559249)
+Author: Martin Wimpress <code at flexion.org>
+Abstract:
+ This works around broken dropbox binary that will only activate the 
+ try icon on Ubuntu Unity. This patch works around that issue by
+ coercing QT to use GTK theming and executing dropbox via dbus-launch.
+ .
+ This patch is valid for Debian and Ubuntu alike.
+
+diff --git a/caja-dropbox.in b/caja-dropbox.in
+index 5026ab7..932d779 100755
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -728,7 +728,8 @@ def start_dropbox():
+     if os.access(db_path, os.X_OK):
+         f = open("/dev/null", "w")
+         # we don't reap the child because we're gonna die anyway, let init do it
+-        a = subprocess.Popen([db_path], preexec_fn=os.setsid, cwd=os.path.expanduser("~"),
++        os.environ["QT_STYLE_OVERRIDE"] = "gtk"
++        a = subprocess.Popen(['dbus-launch', db_path], preexec_fn=os.setsid, cwd=os.path.expanduser("~"),
+                              stderr=sys.stderr, stdout=f, close_fds=True)
+ 
+         # in seconds
diff --git a/debian/patches/series b/debian/patches/series
index cd09060..7752a7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 # Patches below are not really upstreamable
 2001_non-interactive-update.patch
 2002_use-dpkg-to-select-platform.patch
+2003_execute_via_dbus_launch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja-dropbox.git