diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | caja-dropbox.in | 4 | ||||
| -rw-r--r-- | data/caja-dropbox.desktop | 6 | ||||
| -rw-r--r-- | src/dropbox.c | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index c5a9457..8985128 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAG} +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} bin_SCRIPTS = caja-dropbox CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt diff --git a/caja-dropbox.in b/caja-dropbox.in index b1246e3..02f9519 100755 --- a/caja-dropbox.in +++ b/caja-dropbox.in @@ -62,7 +62,7 @@ UNPACKING = u"Unpacking Dropbox... %d%%" PARENT_DIR = os.path.expanduser("~") DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR -DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/dropbox.desktop" +DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/caja-dropbox.desktop" enc = locale.getpreferredencoding() @@ -1280,7 +1280,7 @@ def reroll_autostart(should_autostart): # UBUNTU if u".config" in contents: autostart_dir = os.path.join(home_dir, u".config", u"autostart") - autostart_link = os.path.join(autostart_dir, u"dropbox.desktop") + autostart_link = os.path.join(autostart_dir, u"caja-dropbox.desktop") if should_autostart: if os.path.exists(DESKTOP_FILE): if not os.path.exists(autostart_dir): diff --git a/data/caja-dropbox.desktop b/data/caja-dropbox.desktop index 810a811..6d7ccb4 100644 --- a/data/caja-dropbox.desktop +++ b/data/caja-dropbox.desktop @@ -1,9 +1,9 @@ #!/usr/bin/env xdg-open [Desktop Entry] -Name=caja-Dropbox +Name=Caja Dropbox GenericName=File Synchronizer For Mate -Comment=Sync your files across computers and to the web -Exec=dropbox start -i +Comment=Installs and launches proprietary Dropbox cloud software +Exec=caja-dropbox start -i Terminal=false Type=Application Icon=caja-dropbox diff --git a/src/dropbox.c b/src/dropbox.c index e5782e3..cbb1d85 100644 --- a/src/dropbox.c +++ b/src/dropbox.c @@ -41,9 +41,7 @@ caja_module_initialize (GTypeModule *module) { caja_dropbox_register_type (module); type_list[0] = CAJA_TYPE_DROPBOX; - dropbox_use_caja_submenu_workaround - = (CAJA_VERSION_MAJOR < 2 || - (CAJA_VERSION_MAJOR == 2 && CAJA_VERSION_MINOR <= 22)); + dropbox_use_caja_submenu_workaround = FALSE; dropbox_use_operation_in_progress_workaround = TRUE; } |