From 4ec63f78693849b9f70469081aded7f88b2753a7 Mon Sep 17 00:00:00 2001
From: Nate Hart <nejthan@gmail.com>
Date: Sun, 7 Jun 2015 22:09:26 -0500
Subject: Added icon dirs to config

---
 config.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config.mk b/config.mk
index a7356c8..c16b00a 100644
--- a/config.mk
+++ b/config.mk
@@ -3,6 +3,7 @@ VERSION ?= ${shell git describe --dirty}
 
 # Prefix for all installed files
 PREFIX ?= /usr/local
+ICON_PREFIX ?= /usr/share/icons
 
 # Directories for manuals, executables, docs, data, etc.
 main_dir = ${DESTDIR}${PREFIX}
@@ -13,6 +14,9 @@ image_dir = ${main_dir}/share/feh/images
 font_dir = ${main_dir}/share/feh/fonts
 example_dir = ${main_dir}/share/doc/feh/examples
 desktop_dir = ${main_dir}/share/applications
+icon_dir = ${ICON_PREFIX}/hicolor
+48_icon_dir = ${icon_dir}/48x48/apps
+scalable_icon_dir = ${icon_dir}/scalable/apps
 
 # default CFLAGS
 CFLAGS ?= -g -O2
-- 
cgit v1.2.3


From 3c615174ad60a51ad3e7771a94afc70f827a2fce Mon Sep 17 00:00:00 2001
From: Nate Hart <nejthan@gmail.com>
Date: Sun, 7 Jun 2015 22:09:57 -0500
Subject: Added install-icon to Makefile

---
 Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9f90891..7c5cabd 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ test-x11: all
 	prove test/feh-bg-i.t
 
 install: install-man install-doc install-bin install-font install-img
-install: install-examples install-applications
+install: install-icon install-examples install-applications
 
 ifeq (${cam},1)
 install: install-cam
@@ -69,6 +69,15 @@ install-img:
 	@cp share/images/* ${image_dir}
 	@chmod 644 ${image_dir}/*
 
+install-icon:
+	@echo installing icon to ${48_icon_dir}
+	@mkdir -p ${48_icon_dir}
+	@cp share/images/feh.png ${48_icon_dir}
+	@echo installing icon to ${scalable_icon_dir}
+	@mkdir -p ${scalable_icon_dir}
+	@cp share/images/feh.svg ${scalable_icon_dir}
+	@gtk-update-icon-cache ${icon_dir}
+
 install-examples:
 	@echo installing examples to ${example_dir}
 	@mkdir -p ${example_dir}
-- 
cgit v1.2.3


From ec8a605e62bc446f2d72101826472efab92a25fc Mon Sep 17 00:00:00 2001
From: Nate Hart <nejthan@gmail.com>
Date: Sun, 7 Jun 2015 22:10:20 -0500
Subject: Changed feh.desktop icon to just

---
 share/applications/feh.pre | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/applications/feh.pre b/share/applications/feh.pre
index 78a3824..64e6334 100644
--- a/share/applications/feh.pre
+++ b/share/applications/feh.pre
@@ -6,7 +6,7 @@ Comment=Fast Imlib2-based Image Viewer
 Exec=feh %F
 Terminal=false
 Type=Application
-Icon=$IMAGEDIR$/feh.png
+Icon=feh
 Categories=Graphics;2DGraphics;Viewer;
 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-tga;image/x-xbitmap;
 Name[en_US]=feh
-- 
cgit v1.2.3