[caja-dropbox] 01/04: debian/patches: Drop 2003_ayatana_icon_fix.patch, is not a fix for all configurations.

[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 f806187dc01ef55b8d9f9cf4f3811406cabc8138
Author: Martin Wimpress <code at flexion.org>
Date:   Tue Apr 12 12:45:30 2016 +0100

    debian/patches: Drop 2003_ayatana_icon_fix.patch, is not a fix for all configurations.
---
 debian/patches/2003_ayatana_icon_fix.patch | 24 ------------------------
 debian/patches/series                      |  1 -
 2 files changed, 25 deletions(-)

diff --git a/debian/patches/2003_ayatana_icon_fix.patch b/debian/patches/2003_ayatana_icon_fix.patch
deleted file mode 100644
index ee12262..0000000
--- a/debian/patches/2003_ayatana_icon_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Correctly display the Dropbox applet icon if Ayatana indicators are available. Closes (LP: #1559249)
-Author: Martin Wimpress <code at flexion.org>
-Abstract:
- This works around broken dropbox binary that presumes Unity is the only
- desktop environment with Ayatana Indicator support.
- .
- This patch is valid for Debian and Ubuntu alike.
-
-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 dc39add..cd09060 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@
 # 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