summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpc <pc@pc-07.(none)>2013-02-19 09:05:09 +0800
committerpc <pc@pc-07.(none)>2013-02-19 09:05:09 +0800
commitf35a5dbd628ece9d6c0d8b70b2a4392e7e227ad4 (patch)
treec1dbd873eab6dc6745739c0c809d60b35e43414c
parent0f59e97468dae7ddf1a389281d488e6972c273c9 (diff)
downloadcaja-dropbox-f35a5dbd628ece9d6c0d8b70b2a4392e7e227ad4.tar.bz2
caja-dropbox-f35a5dbd628ece9d6c0d8b70b2a4392e7e227ad4.tar.xz
Rename desktop file as caja-dropbox.desktop, fix conflict with gnome-dropbox.
-rw-r--r--data/Makefile.am2
-rw-r--r--data/caja-dropbox.desktop (renamed from data/dropbox.desktop)0
2 files changed, 1 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 32669ad..fecd5e0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
applicationdir = $(datadir)/applications
-application_DATA = dropbox.desktop
+application_DATA = caja-dropbox.desktop
EXTRA_DIST = $(application_DATA)
diff --git a/data/dropbox.desktop b/data/caja-dropbox.desktop
index 7ad5369..7ad5369 100644
--- a/data/dropbox.desktop
+++ b/data/caja-dropbox.desktop