[geary/pantheon_mail: 27/32] use cmake variables in .desktops

[Javier Jardón Cabezas <jjardon src gnome org>]

commit cf559ccc33d19dd4a56d4eadd4aa14301b85e103
Author: Daniel Foré <daniel elementary io>
Date:   Tue Nov 24 14:46:58 2015 -0800

    use cmake variables in .desktops

 CMakeLists.txt                  |    5 ++++-
 data/geary-autostart.desktop.in |   14 ++++++--------
 data/geary.desktop.in           |   24 +++++++++++-------------
 3 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff56ace..97687fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,10 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 # Base bits
 #
 set(GETTEXT_PACKAGE "geary")
-set(RELEASE_NAME "Lightweight email client for GNOME.")
+set(EXEC_NAME "geary")
+set(APP_NAME "Mail")
+set(RELEASE_NAME "Lightweight email client")
+set(DESKTOP_ICON "internet-mail")
 set(VERSION "0.10.0")
 set(VERSION_INFO "Release")
 set(LANGUAGE_SUPPORT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/locale)
diff --git a/data/geary-autostart.desktop.in b/data/geary-autostart.desktop.in
index c3a06e1..7ffc23f 100644
--- a/data/geary-autostart.desktop.in
+++ b/data/geary-autostart.desktop.in
@@ -1,12 +1,10 @@
 [Desktop Entry]
-_Name=Geary
-_GenericName=Mail Client
-_X-GNOME-FullName=Geary Mail
-_Comment=Send and receive email
-_Keywords=Email;E-mail;Mail;
-Icon=internet-mail
-TryExec=geary
-Exec=geary --hidden
+Name= APP_NAME@
+Comment= RELEASE_NAME@
+TryExec= EXEC_NAME@
+Exec= EXEC_NAME@ --hidden
+Icon= DESKTOP_ICON@
+Keywords=Email;E-mail;Mail;
 Type=Application
 Terminal=false
 Categories=GNOME;GTK;Network;Email;
diff --git a/data/geary.desktop.in b/data/geary.desktop.in
index 72b64d4..3da9cc9 100644
--- a/data/geary.desktop.in
+++ b/data/geary.desktop.in
@@ -1,22 +1,20 @@
 [Desktop Entry]
-_Name=Geary
-_GenericName=Mail Client
-_X-GNOME-FullName=Geary Mail
-_Comment=Send and receive email
-_Keywords=Email;E-mail;Mail;
-Icon=internet-mail
-TryExec=geary
-Exec=geary %U
-Type=Application
+Name= APP_NAME@
+Comment= RELEASE_NAME@
+TryExec= EXEC_NAME@
+Exec= EXEC_NAME@ %U
+Icon= DESKTOP_ICON@
+Keywords=Email;E-mail;Mail;
 Terminal=false
-Categories=GNOME;GTK;Network;Email;
+Type=Application
 MimeType=x-scheme-handler/mailto;
 StartupNotify=true
+Categories=GNOME;GTK;Network;Email;
+X-GNOME-Gettext-Domain= GETTEXT_PACKAGE@
 X-GNOME-UsesNotifications=true
 Actions=Compose;
 
 [Desktop Action Compose]
-_Name=Compose Message
-Exec=geary mailto:
-
+Name=Compose Message
+Exec= EXEC_NAME@ mailto: