1 --- caja-dropbox-1.8.0/./caja-dropbox.in~ 2014-08-11 20:06:44.000000000 +0300
2 +++ caja-dropbox-1.8.0/./caja-dropbox.in 2014-08-11 20:09:13.478183272 +0300
4 UNPACKING = u"Unpacking Dropbox... %d%%"
6 PARENT_DIR = os.path.expanduser("~")
7 -DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
8 +DROPBOXD_PATH = "/usr/bin/dropboxd"
9 +if not os.access(DROPBOXD_PATH , os.X_OK):
10 + DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
11 DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/caja-dropbox.desktop"
13 enc = locale.getpreferredencoding()
18 - db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding())
19 + db_path = DROPBOXD_PATH
20 if os.access(db_path, os.X_OK):
21 f = open("/dev/null", "w")
22 # we don't reap the child because we're gonna die anyway, let init do it