Merge pull request #2 from hillwoodroc/master

Fix files conflict with nautilus-dropbox
author: benpicco <[email protected]> 2013-02-19 08:46:56 -0800
committer: benpicco <[email protected]> 2013-02-19 08:46:56 -0800
commit: 204631ae053ad91bdb7149f29c5289cab4347eb3 (patch)
tree: c94358f3f4710fc1af6f1b091871ee4413e66153
parent: c096075b4b45d0c0c688a1ba5f69037a7290847a (diff)
parent: 6740ac44bab322adf290bfdb10244d1c9a8aae55 (diff)
download: caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.bz2
caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.xz
20 files changed, 24 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am
index bd79291..7f72814 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,16 @@
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 
-bin_SCRIPTS = dropbox
-CLEANFILES = $(bin_SCRIPTS) dropbox.1 dropbox.txt
-EXTRA_DIST = dropbox.in serializeimages.py dropbox.txt.in docgen.py rst2man.py
-man_MANS = dropbox.1
+bin_SCRIPTS = caja-dropbox
+CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt
+EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py
+man_MANS = caja-dropbox.1
 
-dropbox: dropbox.in serializeimages.py
- python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
- chmod +x dropbox
+caja-dropbox: caja-dropbox.in serializeimages.py
+ python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox
+ chmod +x caja-dropbox
 
-dropbox.1: dropbox.txt.in dropbox docgen.py
- python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
- $(RST2MAN) dropbox.txt > dropbox.1
+caja-dropbox.1: caja-dropbox.txt.in caja-dropbox docgen.py
+ python docgen.py $(PACKAGE_VERSION) < caja-dropbox.txt.in > caja-dropbox.txt
+ $(RST2MAN) caja-dropbox.txt > caja-dropbox.1
 
 SUBDIRS = data src
diff --git a/dropbox.in b/caja-dropbox.in
index abf7e82..abf7e82 100755
--- a/dropbox.in
+++ b/caja-dropbox.in
diff --git a/dropbox.txt.in b/caja-dropbox.txt.in
index 638fdc1..638fdc1 100644
--- a/dropbox.txt.in
+++ b/caja-dropbox.txt.in
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
diff --git a/docgen.py b/docgen.py
index a2a3912..2ed8ad9 100644
--- a/docgen.py
+++ b/docgen.py
@@ -3,7 +3,7 @@ import datetime
 
 # heeeheee
 env = {"__name__":"__notmain__"}
-execfile("dropbox", env)
+execfile("caja-dropbox", env)
 commands = env["commands"]
 
 f = open("AUTHORS", "r")
author	benpicco <[email protected]>	2013-02-19 08:46:56 -0800
committer	benpicco <[email protected]>	2013-02-19 08:46:56 -0800
commit	204631ae053ad91bdb7149f29c5289cab4347eb3 (patch)
tree	c94358f3f4710fc1af6f1b091871ee4413e66153
parent	c096075b4b45d0c0c688a1ba5f69037a7290847a (diff)
parent	6740ac44bab322adf290bfdb10244d1c9a8aae55 (diff)
download	caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.bz2 caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.xz