Merge lp:~lains/snap-elementary/fix-appid into lp:snap-elementary

[Lains]

Snap Photobooth "org.pantheon.snap":

* Fixed filenames to the AppID name.
* Fixed code to have it point to a new AppID.

Snap Photobooth "org.pantheon.snap-elementary":

* Fixed filenames to the AppID name.
* Fixed code to have it point to a new AppID.

[Rico Tzschichholz (ricotz)]

I guess "org.pantheon.snap" would suffice.

[Lains (lains)]

Well, this app is named throughout the code as snap-elementary, I thought that it would be good to keep that naming in the other places.

[Danielle Foré (danrabbit)]

I believe this is only to avoid naming conflicts. If we're using RDNN that fixes the naming conflicts. So rico is right. No need to have -elementary here

[lp:~lains/snap-elementary/fix-appid]

402. By Lains <email address hidden> on 2016-09-01

Fix Snap AppID and rename files to the new AppID, part 2

[Lains (lains)]

And it's fixed.

[Felipe Escoto (philip.scott)]

Approved, but on hold until Loki is out

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-07-30 18:16:04 +0000
+++ data/CMakeLists.txt	2016-09-01 20:04:22 +0000
@@ -2,16 +2,16 @@
 
 # We need to create two temporary desktop files in order to have all translations available.
 set (APP_NAME "Camera")
-configure_file(snap-photobooth.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop.in)
+configure_file(org.pantheon.snap.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop.in)
 set (APP_NAME "Snap")
-configure_file(snap-photobooth.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth-original.desktop.in)
+configure_file(org.pantheon.snap.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap-original.desktop.in)
 if (BUILD_FOR_ELEMENTARY)
-    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop ${CMAKE_SOURCE_DIR}/po/)
+    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop ${CMAKE_SOURCE_DIR}/po/)
 else ()
-    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop ${CMAKE_SOURCE_DIR}/po/)
+    configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop ${CMAKE_SOURCE_DIR}/po/)
 endif ()
 
-configure_file_translation(${CMAKE_CURRENT_SOURCE_DIR}/snap-photobooth.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation(${CMAKE_CURRENT_SOURCE_DIR}/org.pantheon.snap.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.appdata.xml DESTINATION share/appdata)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.appdata.xml DESTINATION share/appdata)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop DESTINATION share/applications)
 
=== renamed file 'data/snap-photobooth.appdata.xml.in' => 'data/org.pantheon.snap.appdata.xml.in'
=== renamed file 'data/snap-photobooth.desktop.in.in' => 'data/org.pantheon.snap.desktop.in.in'
=== modified file 'src/Application.vala'
--- src/Application.vala	2016-07-30 18:16:04 +0000
+++ src/Application.vala	2016-09-01 20:04:22 +0000
@@ -44,7 +44,7 @@
         app_years = "2011-2016";
         app_icon = "accessories-camera";
         app_launcher = "snap-photobooth.desktop";
-        application_id = "net.launchpad.snap-elementary";
+        application_id = "org.pantheon.snap";
         main_url = "https://launchpad.net/snap-elementary";
         bug_url = "https://bugs.launchpad.net/snap-elementary";
         help_url = "https://answers.launchpad.net/snap-elementary";