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

Proposed by Lains on 2016-09-01
Status: Merged
Approved by: Daniel Fore on 2016-09-15
Approved revision: 402
Merged at revision: 403
Proposed branch: lp:~lains/snap-elementary/fix-appid
Merge into: lp:snap-elementary
Diff against target: 42 lines (+8/-8)
2 files modified
data/CMakeLists.txt (+7/-7)
src/Application.vala (+1/-1)
To merge this branch: bzr merge lp:~lains/snap-elementary/fix-appid
Reviewer Review Type Date Requested Status
Felipe Escoto 2016-09-01 Approve on 2016-09-02
Review via email: mp+304590@code.launchpad.net

Commit message

Snap Photobooth "org.pantheon.snap":

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

Description of the change

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

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

To post a comment you must log in.
Rico Tzschichholz (ricotz) wrote :

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

Lains (lains) wrote :

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.

Daniel Fore (danrabbit) wrote :

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 updated on 2016-09-01
402. By Lains <email address hidden> on 2016-09-01

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

Lains (lains) wrote :

And it's fixed.

Felipe Escoto (philip.scott) wrote :

Approved, but on hold until Loki is out

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-07-30 18:16:04 +0000
3+++ data/CMakeLists.txt 2016-09-01 20:04:22 +0000
4@@ -2,16 +2,16 @@
5
6 # We need to create two temporary desktop files in order to have all translations available.
7 set (APP_NAME "Camera")
8-configure_file(snap-photobooth.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop.in)
9+configure_file(org.pantheon.snap.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop.in)
10 set (APP_NAME "Snap")
11-configure_file(snap-photobooth.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth-original.desktop.in)
12+configure_file(org.pantheon.snap.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap-original.desktop.in)
13 if (BUILD_FOR_ELEMENTARY)
14- configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop ${CMAKE_SOURCE_DIR}/po/)
15+ configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop ${CMAKE_SOURCE_DIR}/po/)
16 else ()
17- configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop ${CMAKE_SOURCE_DIR}/po/)
18+ 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/)
19 endif ()
20
21-configure_file_translation(${CMAKE_CURRENT_SOURCE_DIR}/snap-photobooth.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
22+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/)
23
24-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.appdata.xml DESTINATION share/appdata)
25-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/snap-photobooth.desktop DESTINATION share/applications)
26+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.appdata.xml DESTINATION share/appdata)
27+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.snap.desktop DESTINATION share/applications)
28
29=== renamed file 'data/snap-photobooth.appdata.xml.in' => 'data/org.pantheon.snap.appdata.xml.in'
30=== renamed file 'data/snap-photobooth.desktop.in.in' => 'data/org.pantheon.snap.desktop.in.in'
31=== modified file 'src/Application.vala'
32--- src/Application.vala 2016-07-30 18:16:04 +0000
33+++ src/Application.vala 2016-09-01 20:04:22 +0000
34@@ -44,7 +44,7 @@
35 app_years = "2011-2016";
36 app_icon = "accessories-camera";
37 app_launcher = "snap-photobooth.desktop";
38- application_id = "net.launchpad.snap-elementary";
39+ application_id = "org.pantheon.snap";
40 main_url = "https://launchpad.net/snap-elementary";
41 bug_url = "https://bugs.launchpad.net/snap-elementary";
42 help_url = "https://answers.launchpad.net/snap-elementary";

Subscribers

People subscribed via source and target branches

to all changes: