[caja-dropbox] 01/02: debian/patches: Add 2003_fake_xdg_current_desktop.patch. Coerce XDG_CURRENT_DESKTOP to ensure indicator icons and menus work. (LP:#1559249)

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch ubuntu/zesty
in repository caja-dropbox.

commit c2ed94719a2d736b5583ccc1401d58ff5f9ce159
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Sun Mar 26 14:15:19 2017 +0100

    debian/patches: Add 2003_fake_xdg_current_desktop.patch. Coerce XDG_CURRENT_DESKTOP to ensure indicator icons and menus work. (LP:#1559249)
---
 debian/patches/2003_execute_via_dbus_launch.patch  | 23 ----------------------
 debian/patches/2003_fake_xdg_current_desktop.patch | 21 ++++++++++++++++++++
 debian/patches/series                              |  2 +-
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/debian/patches/2003_execute_via_dbus_launch.patch b/debian/patches/2003_execute_via_dbus_launch.patch
deleted file mode 100644
index 80fb338..0000000
--- a/debian/patches/2003_execute_via_dbus_launch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/2003_fake_xdg_current_desktop.patch b/debian/patches/2003_fake_xdg_current_desktop.patch
new file mode 100644
index 0000000..11312f0
--- /dev/null
+++ b/debian/patches/2003_fake_xdg_current_desktop.patch
@@ -0,0 +1,21 @@
+Description: Fake XDG_CURRENT_DESKTOP. 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 < 16.10. This patch works around that issue 
+ by coercing XDG_CURRENT_DESKTOP to report as "Unity".
+ .
+ This patch is valid for Debian and Ubuntu alike.
+ 
+diff --git a/caja-dropbox.in b/caja-dropbox.in
+index 5026ab7..ed36e44 100755
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -728,6 +728,7 @@ 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
++        os.environ["XDG_CURRENT_DESKTOP"] = "Unity"
+         a = subprocess.Popen([db_path], preexec_fn=os.setsid, cwd=os.path.expanduser("~"),
+                              stderr=sys.stderr, stdout=f, close_fds=True)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7752a7f..c11cd79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +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
+2003_fake_xdg_current_desktop.patch

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