Merge pull request #2 from hillwoodroc/master

Fix files conflict with nautilus-dropbox 

16 files changed, 13 insertions, 12 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 32669ad..13e18d2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 applicationdir = $(datadir)/applications
-application_DATA = dropbox.desktop
+application_DATA = caja-dropbox.desktop
 
-EXTRA_DIST = $(application_DATA)
+EXTRA_DIST = $(application_DATA) 
 
 SUBDIRS = icons emblems
diff --git a/data/dropbox.desktop b/data/caja-dropbox.desktop
index 7dbc95d..810a811 100644
--- a/data/dropbox.desktop
+++ b/data/caja-dropbox.desktop
@@ -1,10 +1,11 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
-Name=Dropbox
-GenericName=File Synchronizer
+Name=caja-Dropbox
+GenericName=File Synchronizer For Mate
 Comment=Sync your files across computers and to the web
 Exec=dropbox start -i
 Terminal=false
 Type=Application
-Icon=dropbox
+Icon=caja-dropbox
 Categories=Network;FileTransfer;
 StartupNotify=false
diff --git a/data/icons/hicolor/16x16/apps/Makefile.am b/data/icons/hicolor/16x16/apps/Makefile.am
index 1412ea3..b2ec0da 100644
--- a/data/icons/hicolor/16x16/apps/Makefile.am
+++ b/data/icons/hicolor/16x16/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/16x16/apps/dropbox.png b/data/icons/hicolor/16x16/apps/caja-dropbox.png
index c24af65..c24af65 100644
--- a/data/icons/hicolor/16x16/apps/dropbox.png
+++ b/data/icons/hicolor/16x16/apps/caja-dropbox.png
diff --git a/data/icons/hicolor/22x22/apps/Makefile.am b/data/icons/hicolor/22x22/apps/Makefile.am
index 161ccc5..e6a228f 100644
--- a/data/icons/hicolor/22x22/apps/Makefile.am
+++ b/data/icons/hicolor/22x22/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/22x22/apps/dropbox.png b/data/icons/hicolor/22x22/apps/caja-dropbox.png
index 37eb05a..37eb05a 100644
--- a/data/icons/hicolor/22x22/apps/dropbox.png
+++ b/data/icons/hicolor/22x22/apps/caja-dropbox.png
diff --git a/data/icons/hicolor/24x24/apps/Makefile.am b/data/icons/hicolor/24x24/apps/Makefile.am
index 6dc45f5..d782f02 100644
--- a/data/icons/hicolor/24x24/apps/Makefile.am
+++ b/data/icons/hicolor/24x24/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/24x24/apps/dropbox.png b/data/icons/hicolor/24x24/apps/caja-dropbox.png
index c4c7e45..c4c7e45 100644
--- a/data/icons/hicolor/24x24/apps/dropbox.png
+++ b/data/icons/hicolor/24x24/apps/caja-dropbox.png
diff --git a/data/icons/hicolor/256x256/apps/Makefile.am b/data/icons/hicolor/256x256/apps/Makefile.am
index ae589f9..4f4c6f3 100644
--- a/data/icons/hicolor/256x256/apps/Makefile.am
+++ b/data/icons/hicolor/256x256/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/256x256/apps/dropbox.png b/data/icons/hicolor/256x256/apps/caja-dropbox.png
index 0fee1d4..0fee1d4 100644
--- a/data/icons/hicolor/256x256/apps/dropbox.png
+++ b/data/icons/hicolor/256x256/apps/caja-dropbox.png
diff --git a/data/icons/hicolor/32x32/apps/Makefile.am b/data/icons/hicolor/32x32/apps/Makefile.am
index ab29e83..30e0537 100644
--- a/data/icons/hicolor/32x32/apps/Makefile.am
+++ b/data/icons/hicolor/32x32/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/32x32/apps/dropbox.png b/data/icons/hicolor/32x32/apps/caja-dropbox.png
index 8e65438..8e65438 100644
--- a/data/icons/hicolor/32x32/apps/dropbox.png
+++ b/data/icons/hicolor/32x32/apps/caja-dropbox.png
diff --git a/data/icons/hicolor/48x48/apps/Makefile.am b/data/icons/hicolor/48x48/apps/Makefile.am
index 9b99f8e..0348cbe 100644
--- a/data/icons/hicolor/48x48/apps/Makefile.am
+++ b/data/icons/hicolor/48x48/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/48x48/apps/dropbox.png b/data/icons/hicolor/48x48/apps/caja-dropbox.png
index 164119d..164119d 100644
--- a/data/icons/hicolor/48x48/apps/dropbox.png
+++ b/data/icons/hicolor/48x48/apps/caja-dropbox.png
diff --git a/data/icons/hicolor/64x64/apps/Makefile.am b/data/icons/hicolor/64x64/apps/Makefile.am
index eba2531..dc95b97 100644
--- a/data/icons/hicolor/64x64/apps/Makefile.am
+++ b/data/icons/hicolor/64x64/apps/Makefile.am
@@ -4,6 +4,6 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA = dropbox.png
+icons_DATA = caja-dropbox.png
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/data/icons/hicolor/64x64/apps/dropbox.png b/data/icons/hicolor/64x64/apps/caja-dropbox.png
index 88226da..88226da 100644
--- a/data/icons/hicolor/64x64/apps/dropbox.png
+++ b/data/icons/hicolor/64x64/apps/caja-dropbox.png