From 2a153e19f37e610781543a0b0ae921d92811b716 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Sat, 13 Aug 2011 14:20:28 -0500
Subject: [PATCH] Fixing the launcher icon for harmattan (even if I am doing
 it wrong)

---
 Makefile              |    7 ++++---
 data/template.desktop |    7 ++++++-
 setup.py              |    1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 24904d7..3592b41 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SOURCE_PATH=$(PACKAGE_NAME)
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 
 PROGRAM=Gonvert
-ICON_SIZES=26 32 48 80
+ICON_SIZES=26 32 48 64 80
 ICONS=$(foreach size, $(ICON_SIZES), data/icons/$(size)/$(PROJECT_NAME).png)
 PACKAGE_VARIANTS=fremantle harmattan ubuntu
 DESKTOP_FILES=$(foreach variant, $(PACKAGE_VARIANTS), data/$(variant)/$(PROJECT_NAME).desktop)
@@ -119,8 +119,8 @@ setup.harmattan.py: setup.py src/constants.py
 	cog.py -c \
 		-D DESKTOP_FILE_PATH=/usr/share/applications \
 		-D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
-		-D ICON_CATEGORY=hildon \
-		-D ICON_SIZES=32,80 \
+		-D ICON_CATEGORY=apps \
+		-D ICON_SIZES=64,80 \
 		-o $@ $<
 	chmod +x $@
 
@@ -144,6 +144,7 @@ $(DESKTOP_FILES): data/template.desktop
 	cog.py -d \
 		-D VARIANT=$(VARIANT) \
 		-D PROGRAM=$(PROGRAM) \
+		-D ICON_NAME=$(PROJECT_NAME) \
 		-o $@ $<
 
 
diff --git a/data/template.desktop b/data/template.desktop
index 2c2428c..a0a1e84 100644
--- a/data/template.desktop
+++ b/data/template.desktop
@@ -11,10 +11,15 @@ Comment=Unit Converter
 #		cog.outl("Exec=/usr/local/bin/%s" % PROGRAM)
 #	else:
 #		raise RuntimeError("Unsupported desktop file flavor %r" % PROGRAM)
+#
+#	if VARIANT == "harmattan":
+#		cog.outl("Icon=/usr/share/icons/hicolor/80x80/apps/%s.png" % ICON_NAME)
+#	else:
+#		cog.outl("Icon=%s" % ICON_NAME)
 #]]]
 Exec=/usr/local/bin/Gonvert
-#[[[end]]]
 Icon=gonvert
+#[[[end]]]
 Categories=Engineering;Science;Education;Utility;Qt;
 Type=Application
 Encoding=UTF-8
diff --git a/setup.py b/setup.py
index 31d3d65..61c2a99 100755
--- a/setup.py
+++ b/setup.py
@@ -89,6 +89,7 @@ setup(
 	},
 	data_files=[
 		(DESKTOP_FILE_PATH, [INPUT_DESKTOP_FILE]),
+		("/usr/share/icons/hicolor/scalable/apps", ["data/%s.svg" % APP_NAME]),
 	] +
 	[
 		(
-- 
1.7.9.5