summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Evins <evins@snaught.com>2010-09-05 22:35:59 -0400
committerJim Evins <evins@snaught.com>2010-09-05 22:35:59 -0400
commit9667f709d131a52eca55c5a8400f20d4084a1409 (patch)
tree28a0f4673deb1430b930986be2aa8e9ca70d4e61
parent065ffb88346791da881cfed8a06343c6b6e4b50c (diff)
Manage mimetype icon with other theme friendly icons.
-rw-r--r--data/icons/48x48/Makefile.am7
-rw-r--r--data/icons/48x48/mimetypes/application-x-glabels.png (renamed from data/pixmaps/application-x-glabels.png)bin2242 -> 2242 bytes
-rw-r--r--data/pixmaps/Makefile.am10
3 files changed, 7 insertions, 10 deletions
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 64a76f9..b219845 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
index 9f300f3..9f300f3 100644
--- a/data/pixmaps/application-x-glabels.png
+++ b/data/icons/48x48/mimetypes/application-x-glabels.png
Binary files differ
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index f531e89..26b4cd7 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)