From 641d410d53fb9dbc045c0f328340268220413d63 Mon Sep 17 00:00:00 2001
From: Ramiro Estrugo <ramiro@src.gnome.org>
Date: Wed, 24 May 2000 18:12:35 +0000
Subject: [PATCH] Rename the 'mime-type' capplet to 'nautilus-mime-capplet' to
 avoid clobbering the control-center's one.

---
 capplets/file-types/.cvsignore                |  2 +-
 capplets/file-types/Makefile.am               | 24 ++++++++++++-------
 ...me-type-capplet.c => file-types-capplet.c} |  0
 ...ype.desktop => nautilus-mime-type.desktop} |  0
 4 files changed, 16 insertions(+), 10 deletions(-)
 rename capplets/file-types/{mime-type-capplet.c => file-types-capplet.c} (100%)
 rename capplets/file-types/{mime-type.desktop => nautilus-mime-type.desktop} (100%)

diff --git a/capplets/file-types/.cvsignore b/capplets/file-types/.cvsignore
index 695625db1..7ef4ea673 100644
--- a/capplets/file-types/.cvsignore
+++ b/capplets/file-types/.cvsignore
@@ -2,4 +2,4 @@ Makefile
 Makefile.in
 .deps
 .libs
-mime-type-capplet
+nautilus-mime-type-capplet
diff --git a/capplets/file-types/Makefile.am b/capplets/file-types/Makefile.am
index 245761ce2..20a2b3df5 100644
--- a/capplets/file-types/Makefile.am
+++ b/capplets/file-types/Makefile.am
@@ -5,25 +5,31 @@ INCLUDES = -I. -I$(srcdir) 				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(includedir)
 
-bin_PROGRAMS = mime-type-capplet
+bin_PROGRAMS = nautilus-mime-type-capplet
 
-mime_type_capplet_SOURCES = mime-type-capplet.c\
-	mime-data.h mime-data.c edit-window.c\
-	edit-window.h mime-info.c mime-info.h \
-	new-mime-window.h new-mime-window.c
+nautilus_mime_type_capplet_SOURCES =\
+	nautilus-mime-type-capplet.c\
+	mime-data.h \
+	mime-data.c \
+	edit-window.c \
+	edit-window.h \
+	mime-info.c \
+	mime-info.h \
+	new-mime-window.h \
+	new-mime-window.c
 
-mime_type_capplet_LDADD =\
+nautilus_mime_type_capplet_LDADD =\
 			$(CAPPLET_LIBDIR) \
 			$(CAPPLET_LIBS)
 			$(ORBIT_LIBS) \
 			$(INTLLIBS)
 
 EXTRA_DIST = \
-	mime-type.desktop
+	nautilus-mime-type.desktop
 
 
 sysdir = $(datadir)/control-center
-sys_DATA = mime-type.desktop 
+sys_DATA = nautilus-mime-type.desktop 
 
 install-data-local:
-	$(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/mime-type.desktop
+	$(INSTALL_DATA) $(srcdir)/nautilus-mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/nautilus-mime-type.desktop
diff --git a/capplets/file-types/mime-type-capplet.c b/capplets/file-types/file-types-capplet.c
similarity index 100%
rename from capplets/file-types/mime-type-capplet.c
rename to capplets/file-types/file-types-capplet.c
diff --git a/capplets/file-types/mime-type.desktop b/capplets/file-types/nautilus-mime-type.desktop
similarity index 100%
rename from capplets/file-types/mime-type.desktop
rename to capplets/file-types/nautilus-mime-type.desktop