Manage mimetype icon with other theme friendly icons.

diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 64a76f96eee329eb27fb89e7f1b5995b7432b68e..b219845223382082e190914d66b7708eb5e41e36 100644 (file)
--- 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/icons/48x48/mimetypes/application-x-glabels.png b/data/icons/48x48/mimetypes/application-x-glabels.png
new file mode 100644 (file)
index 0000000..9f300f3
Binary files /dev/null and b/data/icons/48x48/mimetypes/application-x-glabels.png differ

diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index f531e899c3f706bdbbd0500014126ac8660c2aed..26b4cd7b7c1b7b01f8b7a1caab64d3517f9472c6 100644 (file)
--- 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)

diff --git a/data/pixmaps/application-x-glabels.png b/data/pixmaps/application-x-glabels.png
deleted file mode 100644 (file)
index 9f300f3..0000000
Binary files a/data/pixmaps/application-x-glabels.png and /dev/null differ