[geary/geary-0.11] Revert "Fix Geary not being able to be pinned in gnome-shell. Bug 776721."

[Michael Gratton <mjog src gnome org>]

commit b29505972509cfcd668fdf8face3404195e12ade
Author: Michael James Gratton <mike vee net>
Date:   Tue Feb 7 22:02:37 2017 +1100

    Revert "Fix Geary not being able to be pinned in gnome-shell. Bug 776721."
    
    This reverts commit bdbe0ede244ad3735e5d3f75b023216d2c3606d7.

 cmake/FindIntltool.cmake           |    4 ++--
 desktop/CMakeLists.txt             |    2 --
 desktop/org.gnome.Geary.desktop.in |   21 ---------------------
 po/POTFILES.in                     |    1 -
 4 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/cmake/FindIntltool.cmake b/cmake/FindIntltool.cmake
index be5a693..067b360 100644
--- a/cmake/FindIntltool.cmake
+++ b/cmake/FindIntltool.cmake
@@ -13,11 +13,11 @@ endif (INTLTOOL_MERGE_EXECUTABLE)
 
 if (INTLTOOL_MERGE_FOUND)
     macro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
-        add_custom_target (${desktop_id}.desktop ALL
+        add_custom_target (geary.desktop ALL
             ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
                 ${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.desktop.in ${desktop_id}.desktop
         )
-        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${desktop_id}.desktop DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/applications)
+        install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/applications) 
     endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
     macro (INTLTOOL_MERGE_AUTOSTART_DESKTOP desktop_id po_dir)
         add_custom_target (geary-autostart.desktop ALL
diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt
index d98d723..127911f 100644
--- a/desktop/CMakeLists.txt
+++ b/desktop/CMakeLists.txt
@@ -3,13 +3,11 @@
 #
 
 install(FILES geary.appdata.xml DESTINATION share/appdata)
-install(FILES geary.appdata.xml DESTINATION share/appdata RENAME org.gnome.Geary.appdata.xml)
 
 include (FindIntltool)
 include (FindDesktopFileValidate)
 if (INTLTOOL_MERGE_FOUND)
     INTLTOOL_MERGE_DESKTOP (geary po)
-    INTLTOOL_MERGE_DESKTOP (org.gnome.Geary po)
     INTLTOOL_MERGE_AUTOSTART_DESKTOP (geary-autostart po)
     
     if (DESKTOP_VALIDATE)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d3d2eb2..8f0beae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 [encoding: UTF-8]
 desktop/geary.desktop.in
-desktop/org.gnome.Geary.desktop.in
 desktop/geary-autostart.desktop.in
 [type: gettext/ini]desktop/geary-attach.contract.in
 src/client/accounts/account-dialog-account-list-pane.vala