[caja-dropbox] 01/02: debian/patches: Add 2003_ayatana_icon_fix.patch. Correctly display the Dropbox applet icon if Ayatana indicators are available. 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 1f80c20e2a8c0618d38d04f702e040a1e8d114d5
Author: Martin Wimpress <code at flexion.org>
Date:   Mon Apr 11 13:19:21 2016 +0100

    debian/patches: Add 2003_ayatana_icon_fix.patch. Correctly display the Dropbox applet icon if Ayatana indicators are available. Closes (LP: #1559249)
---
 debian/patches/2003_ayatana_icon_fix.patch | 19 +++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/2003_ayatana_icon_fix.patch b/debian/patches/2003_ayatana_icon_fix.patch
new file mode 100644
index 0000000..238537a
--- /dev/null
+++ b/debian/patches/2003_ayatana_icon_fix.patch
@@ -0,0 +1,19 @@
+Description: Correctly display the Dropbox applet icon if Ayatana indicators are available. Closes (LP: #1559249)
+Author: Martin Wimpress <code at flexion.org>
+
+diff --git a/caja-dropbox.in b/caja-dropbox.in
+index 5026ab7..2d19b65 100755
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -1243,6 +1243,11 @@ options:
+             console_print(u"Dropbox is already running!")
+         return
+ 
++    # Fix indicator on MATE environments with Ayantana indicators.
++    if 'MATE' in os.environ.get("XDG_CURRENT_DESKTOP", '').split(":") \
++      and os.path.isfile('/usr/share/mate-panel/applets/org.ayatana.panel.IndicatorApplet.mate-panel-applet'):
++        os.environ["XDG_CURRENT_DESKTOP"] = "Unity"
++
+     console_print(u"Starting Dropbox...", linebreak=False)
+     console_flush()
+     if not start_dropbox():
diff --git a/debian/patches/series b/debian/patches/series
index cd09060..dc39add 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_ayatana_icon_fix.patch

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