From f35a5dbd628ece9d6c0d8b70b2a4392e7e227ad4 Mon Sep 17 00:00:00 2001
From: pc <pc@pc-07.(none)>
Date: Tue, 19 Feb 2013 09:05:09 +0800
Subject: Rename desktop file as caja-dropbox.desktop, fix conflict with
 gnome-dropbox.

---
 data/Makefile.am          |  2 +-
 data/caja-dropbox.desktop | 10 ++++++++++
 data/dropbox.desktop      | 10 ----------
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 data/caja-dropbox.desktop
 delete mode 100644 data/dropbox.desktop

(limited to 'data')

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/caja-dropbox.desktop b/data/caja-dropbox.desktop
new file mode 100644
index 0000000..7ad5369
--- /dev/null
+++ b/data/caja-dropbox.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=caja-Dropbox
+GenericName=File Synchronizer
+Comment=Sync your files across computers and to the web
+Exec=dropbox start -i
+Terminal=false
+Type=Application
+Icon=caja-dropbox
+Categories=Network;FileTransfer;
+StartupNotify=false
diff --git a/data/dropbox.desktop b/data/dropbox.desktop
deleted file mode 100644
index 7ad5369..0000000
--- a/data/dropbox.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=caja-Dropbox
-GenericName=File Synchronizer
-Comment=Sync your files across computers and to the web
-Exec=dropbox start -i
-Terminal=false
-Type=Application
-Icon=caja-dropbox
-Categories=Network;FileTransfer;
-StartupNotify=false
-- 
cgit v1.2.1