From 9667f709d131a52eca55c5a8400f20d4084a1409 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 5 Sep 2010 22:35:59 -0400
Subject: [PATCH] Manage mimetype icon with other theme friendly icons.

---
 data/icons/48x48/Makefile.am                        |   7 ++++++-
 .../48x48/mimetypes}/application-x-glabels.png      | Bin
 data/pixmaps/Makefile.am                            |  10 +---------
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename data/{pixmaps => icons/48x48/mimetypes}/application-x-glabels.png (100%)

diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 64a76f96..b2198452 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1,11 +1,16 @@
 
 size = 48x48
 appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
+mimetypeiconsdir = $(datadir)/icons/hicolor/$(size)/mimetypes
 
 appicons_DATA = \
 	apps/glabels-3.0.png
 
+mimetypeicons_DATA = \
+	mimetypes/application-x-glabels.png
+
 noinst_DATA =
 
-EXTRA_DIST = $(appicons_DATA) \
+EXTRA_DIST = $(appicons_DATA)		\
+	     $(mimetypeicons_DATA)	\
 	     $(noinst_DATA)
diff --git a/data/pixmaps/application-x-glabels.png b/data/icons/48x48/mimetypes/application-x-glabels.png
similarity index 100%
rename from data/pixmaps/application-x-glabels.png
rename to data/icons/48x48/mimetypes/application-x-glabels.png
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index f531e899..26b4cd7b 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -13,12 +13,4 @@ glabels_pixmaps_DATA = \
 	ex-1layout.png		\
 	ex-2layouts.png		
 
-glabels_app_icondir = $(datadir)/pixmaps
-
-glabels_mime_icondir = $(datadir)/icons/hicolor/48x48/mimetypes
-
-glabels_mime_icon_DATA = \
-	application-x-glabels.png
-
-EXTRA_DIST = $(glabels_pixmaps_DATA)   \
-	     $(glabels_mime_icon_DATA)
+EXTRA_DIST = $(glabels_pixmaps_DATA)
-- 
2.39.5