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

[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 d21f44fbcf1b6e41123dc3b216a0e37cafec63d5
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Thu Mar 1 09:24:40 2018 +0000

    debian/patches: Add 2003_fake_xdg_current_desktop.patch. Coerce XDG_CURRENT_DESKTOP to ensure indicator icons and menus work. (LP: #1559249, #1729482)
---
 debian/patches/2003_fake_xdg_current_desktop.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 29 insertions(+)

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..cb05b41
--- /dev/null
+++ b/debian/patches/2003_fake_xdg_current_desktop.patch
@@ -0,0 +1,28 @@
+Description: Coerce XDG_CURRENT_DESKTOP to "Unity". (LP: #1559249)
+Author: Martin Wimpress <martin.wimpress at ubuntu.com>
+Abstract:
+ This works around broken dropbox binary that will not correctly
+ activate the tray icon or indicator icon. This patch works around
+ that issue by coercing XDG_CURRENT_DESKTOP to report as
+ "Unity".
+ .
+ This patch is valid for Debian and Ubuntu.
+
+
+--- a/caja-dropbox.in	2017-03-28 02:00:33.223411568 +0100
++++ b/caja-dropbox.in	2017-03-28 02:03:34.637407866 +0100
+@@ -728,8 +728,13 @@
+     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
++
++        # Fix indicator icon and menu. (LP: #1559249)
++        new_env = os.environ.copy()
++        new_env['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)
++                             stderr=sys.stderr, stdout=f, close_fds=True, env=new_env)
+ 
+         # in seconds
+         interval = 0.5
diff --git a/debian/patches/series b/debian/patches/series
index 028ea08..d9bcd0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 # Patches below are not really upstreamable
 2001_non-interactive-update.patch
 2002_use-dpkg-to-select-platform.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