4 files changed, 23 insertions, 39 deletions
diff --git a/data/misc/Makefile.am b/data/misc/Makefile.am
index 1dcdb4cd..94138185 100644
--- a/data/misc/Makefile.am
+++ b/data/misc/Makefile.am
@@ -1,15 +1,19 @@
-util_DATA = hexchat.desktop
-utildir = $(datadir)/applications
-
 appdata_in_files = hexchat.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdatadir = $(datadir)/appdata
 @INTLTOOL_XML_RULE@
 
+data_desktopdir = $(datadir)/applications
+data_desktop_in_files = hexchat.desktop.in
+
 if WITH_TM
-util_DATA += htm.desktop
+data_desktop_in_files += htm.desktop.in
 mime_DATA = htm-mime.xml
 mimedir = $(datadir)/mime/packages
+endif
+
+data_desktop_DATA = $(data_desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
 
 UPDATE_MIME_DATABASE = update-mime-database "$(datadir)/mime" || :
 UPDATE_DESKTOP_DATABASE = update-desktop-database -q "$(datadir)/applications" || :
@@ -21,7 +25,5 @@ install-data-hook:
 uninstall-hook:
 	$(UPDATE_MIME_DATABASE);
 	$(UPDATE_DESKTOP_DATABASE);
-endif
-
-CLEANFILES = $(appdata_DATA)
 
+CLEANFILES = $(appdata_DATA) $(data_desktop_DATA)
diff --git a/data/misc/hexchat.desktop b/data/misc/hexchat.desktop
deleted file mode 100644
index f82465c7..00000000
--- a/data/misc/hexchat.desktop
+++ /dev/null
@@ -1,31 +0,0 @@
-[Desktop Entry]
-Name=HexChat
-Name[zh_TW]=網路清談
-GenericName=IRC Client
-GenericName[de]=IRC-Client
-GenericName[es]=Aplicación de IRC
-GenericName[fi]=IRC-sovellus
-GenericName[fr]=Client IRC
-GenericName[hu]=IRC-kliens
-GenericName[it]=Cliente IRC
-GenericName[lt]=IRC klientas
-GenericName[nb]=IRC-klient
-GenericName[pl]=Klient IRC
-GenericName[pt_BR]=Cliente de IRC
-GenericName[sl]=Odjemalec IRC
-GenericName[sv]=IRC-klient
-GenericName[ro]=Client de IRC
-GenericName[zh_TW]=HexChat 聊天程式
-Comment=Chat with other people using Internet Relay Chat
-Comment[fr]=Discutez avec tout le monde sur l'Internet Relay Chat
-Comment[de]=Sich über Internet Relay Chat mit andern Leuten unterhalten
-Comment[it]=Chiacchierare con la gente sull'Internet Relay Chat
-Comment[nb]=Snakk med mennesker på Internet Relay Chat
-Exec=hexchat %U
-Icon=hexchat
-Terminal=false
-Type=Application
-Categories=GTK;Network;IRCClient;
-StartupNotify=true
-X-GNOME-UsesNotifications=true
-MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
diff --git a/data/misc/hexchat.desktop.in b/data/misc/hexchat.desktop.in
new file mode 100644
index 00000000..1408475d
--- /dev/null
+++ b/data/misc/hexchat.desktop.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+_Name=HexChat
+_GenericName=IRC Client
+_Comment=Chat with other people online
+_Keywords=IM;Chat;
+Exec=hexchat %U
+Icon=hexchat
+Terminal=false
+Type=Application
+Categories=GTK;Network;IRCClient;
+StartupNotify=true
+X-GNOME-UsesNotifications=true
+MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
diff --git a/data/misc/htm.desktop b/data/misc/htm.desktop.in
index 53cac289..0971ac77 100644
--- a/data/misc/htm.desktop
+++ b/data/misc/htm.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=HexChat Theme Manager
+_Name=HexChat Theme Manager
 Exec=thememan %f
 Icon=hexchat
 Terminal=false