Merge lp:~donadigo/switchboard/correct-app-id into lp:~elementary-pantheon/switchboard/switchboard

[Adam Bieńkowski]

* Changed .desktop name to it's app id

Fix bug #1593926: ".desktop file name needs to be its AppID".

Corrects the app ID for the desktop file and in the code.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-11-01 01:16:45 +0000
+++ CMakeLists.txt	2016-11-04 22:38:31 +0000
@@ -68,10 +68,10 @@
 #
 
 include (Translations)
-configure_file_translation(${CMAKE_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}.desktop.in ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.desktop ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation(${CMAKE_SOURCE_DIR}/data/org.pantheon.switchboard.desktop.in ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.desktop ${CMAKE_SOURCE_DIR}/po/)
 configure_file_translation(${CMAKE_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}.appdata.xml.in ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
 
-install(FILES ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.desktop DESTINATION ${DATADIR}/applications)
+install(FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.desktop DESTINATION ${DATADIR}/applications)
 install(FILES ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.appdata.xml DESTINATION ${DATADIR}/appdata)
 
 add_subdirectory(po)
 
=== renamed file 'data/switchboard.desktop.in' => 'data/org.pantheon.switchboard.desktop.in'
=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2016-11-03 21:28:25 +0000
+++ src/Switchboard.vala	2016-11-04 22:38:31 +0000
@@ -66,7 +66,7 @@
         };
 
         construct {
-            application_id = "org.elementary.switchboard";
+            application_id = "org.pantheon.switchboard";
             program_name = _("System Settings");
             app_years = "2011-2016";
             exec_name = "switchboard";