From 240bbf8226ca365e2b62ccd2d8433f4e367435a6 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@novell.com>
Date: Tue, 8 Dec 1998 23:30:45 +0000
Subject: [PATCH] Use the new icons

---
 gnome/Makefile.in       |  6 +++++-
 gnome/image.metadata.in | 48 +++++++++++++++++++++++++++++++++++++++++
 gnome/mc.metadata.in    | 11 ----------
 icons/Makefile.in       |  9 +++++++-
 new_icons/Makefile.in   | 20 ++++++++++++++++-
 5 files changed, 80 insertions(+), 14 deletions(-)
 create mode 100644 gnome/image.metadata.in

diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index ff2cc5a97..aac800b54 100644
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -170,7 +170,7 @@ DISTGNOME = \
 main-corba.o: main.c
 	$(CC) -c -DHAVE_CORBA $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o main-corba.o
 
-all: @gmc@ Makefile mc.metadata
+all: @gmc@ Makefile mc.metadata image.metadata
 
 Makefile: Makefile.in ../config.status
 	(cd ..; CONFIG_FILES=gnome/Makefile CONFIG_HEADERS= ./config.status)
@@ -189,6 +189,10 @@ mc.metadata: mc.metadata.in Makefile
 	sed -e 's^\@icondir\@^$(icondir)^g' < $(srcdir)/mc.metadata.in > mc.metadata.tmp \
 	&& mv mc.metadata.tmp mc.metadata 
 
+image.metadata: image.metadata.in Makefile
+	sed -e 's^\@icondir\@^$(icondir)^g' < $(srcdir)/image.metadata.in > image.metadata.tmp \
+	&& mv image.metadata.tmp image.metadata 
+
 @LIBVFS@:
 	cd ../vfs; $(MAKE) @LIBVFS@
 @PCENTRULE@	-$(RMF) @LIBVFS@
diff --git a/gnome/image.metadata.in b/gnome/image.metadata.in
new file mode 100644
index 000000000..ad5a4d8ab
--- /dev/null
+++ b/gnome/image.metadata.in
@@ -0,0 +1,48 @@
+regex: \.bmp$
+	icon-filename=@icondir@/gnome-image-bmp.png
+
+regex: \.gif$
+	icon-filename=@icondir@/gnome-image-gif.png
+
+regex: \.ief$
+	icon-filename=@icondir@/gnome-image-ief.png
+
+regex: \.jpeg$
+	icon-filename=@icondir@/gnome-image-jpeg.png
+
+regex: \.pbm$
+	icon-filename=@icondir@/gnome-image-pbm.png
+
+regex: \.pgm$
+	icon-filename=@icondir@/gnome-image-pgm.png
+
+regex: \.png$
+	icon-filename=@icondir@/gnome-image-png.png
+
+regex: \.pnm$
+	icon-filename=@icondir@/gnome-image-pnm.png
+
+regex: \.ppm$
+	icon-filename=@icondir@/gnome-image-ppm.png
+
+regex: \.ras$
+	icon-filename=@icondir@/gnome-image-ras.png
+
+regex: \.rgb$
+	icon-filename=@icondir@/gnome-image-rgb.png
+
+regex: \.tga$
+	icon-filename=@icondir@/gnome-image-tga.png
+
+regex: \.tiff$
+	icon-filename=@icondir@/gnome-image-tiff.png
+
+regex: \.xbm$
+	icon-filename=@icondir@/gnome-image-xbm.png
+
+regex: \.xpm$
+	icon-filename=@icondir@/gnome-image-xpm.png
+
+regex: \.xwd$
+	icon-filename=@icondir@/gnome-image-xwd.png
+
diff --git a/gnome/mc.metadata.in b/gnome/mc.metadata.in
index ec9ee452e..f89b5dadb 100644
--- a/gnome/mc.metadata.in
+++ b/gnome/mc.metadata.in
@@ -6,10 +6,6 @@ regex: \.h$
 	type=x-application-gnome/c-source
 	icon-filename=@icondir@/h.xpm
 
-regex: \.tiff$
-	type=image/tiff
-	icon-filename=@icondir@/tiff.xpm
-
 regex: \.vcf$
 	type=x-application/vcf
 	icon-filename=@icondir@/calendar.xpm
@@ -18,16 +14,9 @@ regex: \.(gz|Z|bz2)$
 	type=x-application/gzip
 	icon-filename=@icondir@/compressed.xpm
 
-regex: \.gif$
-	type=image/gif
-	icon-filename=@icondir@/gif.xpm
-
 regex: \.html$
 	icon-filename=@icondir@/html.xpm
 
-regex: \.jpeg$
-	icon-filename=@icondir@/jpeg.xpm
-
 regex: \.o$
 	icon-filename=@icondir@/o.xpm
 
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 61811ca12..d24b2c933 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -29,7 +29,14 @@ ALLICONS = a.xpm application.xpm binary.xpm bitmap.xpm blackhole.xpm \
 	xbm.xpm xchess.xpm xfig.xpm xman.xpm xmosaic.xpm xpaint.xpm xpm.xpm \
 	zip.xpm zoo.xpm
 
-DECENTICONS = c.xpm h.xpm tiff.xpm 
+#
+# We are using these icons from the above in gnome, remove as new versions
+# are obtained
+#
+DECENTICONS = \
+	c.xpm h.xpm calendar.xpm  compressed.xpm html.xpm o.xpm 	\
+	sound.xpm makefile.xpm word.xpm zip.xpm tex.xpm cc.xpm man.xpm 	\
+	postscript.xpm 
 
 all:
 
diff --git a/new_icons/Makefile.in b/new_icons/Makefile.in
index 36409ebbf..ae25d0e8b 100644
--- a/new_icons/Makefile.in
+++ b/new_icons/Makefile.in
@@ -13,7 +13,25 @@ INSTALL_DATA = @INSTALL_DATA@
 #
 
 DISTICONS = Makefile.in $(ALLICONS)
-ALLICONS = 
+ALLICONS = 			\
+	gnome-image-bmp.png	\
+	gnome-image-generic.png	\
+	gnome-image-gif.png	\
+	gnome-image-ief.png	\
+	gnome-image-jpeg.png	\
+	gnome-image-pbm.png	\
+	gnome-image-pgm.png	\
+	gnome-image-png.png	\
+	gnome-image-pnm.png	\
+	gnome-image-ppm.png	\
+	gnome-image-ras.png	\
+	gnome-image-rgb.png	\
+	gnome-image-tga.png	\
+	gnome-image-tiff.png	\
+	gnome-image-xbm.png	\
+	gnome-image-xpm.png	\
+	gnome-image-xwd.png
+
 
 all: