[geary] Fix application name in .desktop file: Closes bgno#720781

[Jim Nelson <jnelson src gnome org>]

commit fc0b41d5f910b86608eaf97eb7f37a9e98b72a17
Author: William Jon McCann <william jon mccann gmail com>
Date:   Fri Dec 20 12:46:26 2013 -0800

    Fix application name in .desktop file: Closes bgno#720781
    
    Also corrects alpha-order problems in THANKS file.

 THANKS                                        |    5 +++--
 desktop/geary.desktop.in                      |    3 ++-
 src/client/application/geary-application.vala |    3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/THANKS b/THANKS
index 4f0fd68..84d8e17 100644
--- a/THANKS
+++ b/THANKS
@@ -16,12 +16,13 @@ Jens Georg <mail jensge org>
 Michael George <mdgeorge cs cornell edu>
 Sven Hagemann <sven rednose nl>
 Mathias Hasselmann <mathias openismus com>
-Charles Lehner <rdm cel celehner com>
-Brendan Long <self brendanlong com>
 Timo Kluck <tkluck infty nl>
+Charles Lehner <rdm cel celehner com>
 Avi Levy <avi w levy gmail com>
+Brendan Long <self brendanlong com>
 Angelo Marchesin <marchesin angelo gmail com>
 Kai Mast <mail kai-mast de>
+William Jon McCann <william jon mccann gmail com>
 Thomas Moschny <thomas moschny gmx de>
 Tom Most <twm freecog net>
 Andreas Obergrusberger <tradiaz yahoo de>
diff --git a/desktop/geary.desktop.in b/desktop/geary.desktop.in
index d59c96c..4efbeb7 100644
--- a/desktop/geary.desktop.in
+++ b/desktop/geary.desktop.in
@@ -1,6 +1,7 @@
 [Desktop Entry]
-_Name=Geary Mail
+_Name=Geary
 _GenericName=Mail Client
+_X-GNOME-FullName=Geary Mail
 _Comment=Send and receive email
 _Keywords=Email;E-mail;Mail;
 Icon=geary
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index cf192b6..8005907 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -24,8 +24,9 @@ public class GearyApplication : Gtk.Application {
     
     // These strings must match corresponding strings in desktop/geary.desktop *exactly* and be
     // internationalizable
-    public const string DESKTOP_NAME = _("Geary Mail");
+    public const string DESKTOP_NAME = _("Geary");
     public const string DESKTOP_GENERIC_NAME = _("Mail Client");
+    public const string DESKTOP_GNOME_FULLNAME = _("Geary Mail");
     public const string DESKTOP_COMMENT = _("Send and receive email");
     public const string DESKTOP_KEYWORDS = _("Email;E-mail;Mail;");
     public const string DESKTOP_COMPOSE_NAME = _("Compose Message");