diff -Nru caja-dropbox-1.18.0/debian/changelog caja-dropbox-1.18.0/debian/changelog --- caja-dropbox-1.18.0/debian/changelog 2017-03-14 12:55:39.000000000 +0000 +++ caja-dropbox-1.18.0/debian/changelog 2017-03-26 13:12:19.000000000 +0000 @@ -1,3 +1,12 @@ +caja-dropbox (1.18.0-0ubuntu2) zesty; urgency=medium + + [ Martin Wimpress ] + * debian/patches: + + Add 2003_fake_xdg_current_desktop.patch. Coerce XDG_CURRENT_DESKTOP to + ensure indicator icons and menus work. (LP:#1559249) + + -- Martin Wimpress Sat, 25 Mar 2017 23:49:01 +0000 + caja-dropbox (1.18.0-0ubuntu1) zesty; urgency=medium * New upstream release. diff -Nru caja-dropbox-1.18.0/debian/patches/2003_fake_xdg_current_desktop.patch caja-dropbox-1.18.0/debian/patches/2003_fake_xdg_current_desktop.patch --- caja-dropbox-1.18.0/debian/patches/2003_fake_xdg_current_desktop.patch 1970-01-01 00:00:00.000000000 +0000 +++ caja-dropbox-1.18.0/debian/patches/2003_fake_xdg_current_desktop.patch 2017-03-25 23:47:32.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fake XDG_CURRENT_DESKTOP. Closes (LP: #1559249) +Author: Martin Wimpress +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 -Nru caja-dropbox-1.18.0/debian/patches/series caja-dropbox-1.18.0/debian/patches/series --- caja-dropbox-1.18.0/debian/patches/series 2017-03-13 17:54:05.000000000 +0000 +++ caja-dropbox-1.18.0/debian/patches/series 2017-03-25 23:48:42.000000000 +0000 @@ -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