From 0f59e97468dae7ddf1a389281d488e6972c273c9 Mon Sep 17 00:00:00 2001
From: hillwood <hillwood@hillwood-opensuse.(none)>
Date: Tue, 19 Feb 2013 00:18:25 +0800
Subject: Fix files conflict with gnome-dropbox.

---
 data/icons/hicolor/16x16/apps/Makefile.am   | 2 +-
 data/icons/hicolor/22x22/apps/Makefile.am   | 2 +-
 data/icons/hicolor/24x24/apps/Makefile.am   | 2 +-
 data/icons/hicolor/256x256/apps/Makefile.am | 2 +-
 data/icons/hicolor/32x32/apps/Makefile.am   | 2 +-
 data/icons/hicolor/48x48/apps/Makefile.am   | 2 +-
 data/icons/hicolor/64x64/apps/Makefile.am   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'data/icons')

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/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/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/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/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/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/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)
-- 
cgit v1.2.1