]> git.pld-linux.org Git - packages/caja-dropbox.git/blob - dropboxd-path.patch
code style
[packages/caja-dropbox.git] / dropboxd-path.patch
1 --- nautilus-dropbox-0.6.3/dropbox.in~  2010-06-15 02:36:52.000000000 +0300
2 +++ nautilus-dropbox-0.6.3/dropbox.in   2010-07-08 20:55:18.697946297 +0300
3 @@ -524,7 +524,10 @@
4      return newmeth
5  
6  def start_dropbox():
7 -    db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding())
8 +    # first try dropboxd from system, fallback to user install
9 +    db_path = "/usr/bin/dropboxd"
10 +    if not os.access(db_path, os.X_OK):
11 +        db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding())
12      if os.access(db_path, os.X_OK):
13          f = open("/dev/null", "w")
14          # we don't reap the child because we're gonna die anyway, let init do it
This page took 0.397004 seconds and 3 git commands to generate.