dropboxd-path.patch

   1 --- caja-dropbox-1.7.90/./caja-dropbox.in~      2013-08-02 13:08:23.000000000 +0300
   2 +++ caja-dropbox-1.7.90/./caja-dropbox.in       2014-03-25 16:12:37.274282401 +0200
   3 @@ -55,7 +55,9 @@
   4  UNPACKING = u"Unpacking Dropbox... %d%%"
   5
   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@/dropbox.desktop"
  12
  13  enc = locale.getpreferredencoding()
  14 @@ -699,7 +701,7 @@
  15      return newmeth
  16
  17  def start_dropbox():
  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