up to 1.26.0

[packages/caja-dropbox.git] / dropboxd-path.patch

diff --git a/dropboxd-path.patch b/dropboxd-path.patch
index 0f8f7179af49e04d850a3177caed114aa38f5d6e..1e82e2b1659c82cc317d00d22e72513ae9f42c2e 100644 (file)
--- a/dropboxd-path.patch
+++ b/dropboxd-path.patch
@@ -1,22 +1,13 @@
---- caja-dropbox-1.7.90/./caja-dropbox.in~     2013-08-02 13:08:23.000000000 +0300
-+++ caja-dropbox-1.7.90/./caja-dropbox.in      2014-03-25 16:12:37.274282401 +0200
-@@ -55,7 +55,9 @@
- UNPACKING = u"Unpacking Dropbox... %d%%"
+--- caja-dropbox-1.8.0/./caja-dropbox.in~      2014-08-11 20:06:44.000000000 +0300
++++ caja-dropbox-1.8.0/./caja-dropbox.in       2014-08-11 20:09:13.478183272 +0300
+@@ -61,7 +61,9 @@
+ UNPACKING = _("Unpacking Dropbox... %d%%")
  
  PARENT_DIR = os.path.expanduser("~")
 -DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
 +DROPBOXD_PATH = "/usr/bin/dropboxd"
 +if not os.access(DROPBOXD_PATH , os.X_OK):
 +      DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
- DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/dropbox.desktop"
+ DESKTOP_FILE = "@DESKTOP_FILE_DIR@/caja-dropbox.desktop"
  
  enc = locale.getpreferredencoding()
-@@ -699,7 +701,7 @@
-     return newmeth
- 
- def start_dropbox():
--    db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding())
-+    db_path = DROPBOXD_PATH
-     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