Noise

Merge lp:~philip.scott/noise/AppID.desktop into lp:~elementary-apps/noise/trunk

  1. AppID.desktop
  2. Merge into trunk
Proposed by Felipe Escoto
Status: Merged
Approved by: Cody Garver
Approved revision: 1931
Merged at revision: 1931
Proposed branch: lp:~philip.scott/noise/AppID.desktop
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 39 lines (+6/-6)
2 files modified
data/CMakeLists.txt (+5/-5)
src/Noise.vala (+1/-1)
To merge this branch: bzr merge lp:~philip.scott/noise/AppID.desktop
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+296586@code.launchpad.net

Commit message

AppID as .desktop name

Description of the change

Use AppID as .desktop name

To post a comment you must log in.
lp:~philip.scott/noise/AppID.desktop updated
1931. By Felipe Escoto

Use AppID as .desktop name

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-01-03 00:20:09 +0000
3+++ data/CMakeLists.txt 2016-06-06 17:49:34 +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 "Music")
8-configure_file(noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/noise.desktop.in)
9+configure_file(org.pantheon.noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop.in)
10 set (APP_NAME "Noise")
11-configure_file(noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in)
12+configure_file(org.pantheon.noise.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in)
13 if (BUILD_FOR_ELEMENTARY)
14- configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/noise.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/noise.desktop ${CMAKE_SOURCE_DIR}/po/)
15+ configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop ${CMAKE_SOURCE_DIR}/po/)
16 else ()
17- configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/noise.desktop ${CMAKE_SOURCE_DIR}/po/)
18+ configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/noise-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop ${CMAKE_SOURCE_DIR}/po/)
19 endif ()
20
21 configure_file_translation(${CMAKE_CURRENT_SOURCE_DIR}/noise.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/noise.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
22
23 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/noise.appdata.xml DESTINATION share/appdata)
24-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/noise.desktop DESTINATION share/applications)
25+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.noise.desktop DESTINATION share/applications)
26
27=== renamed file 'data/noise.desktop.in.in' => 'data/org.pantheon.noise.desktop.in.in'
28=== modified file 'src/Noise.vala'
29--- src/Noise.vala 2016-02-10 12:18:25 +0000
30+++ src/Noise.vala 2016-06-06 17:49:34 +0000
31@@ -50,7 +50,7 @@
32 app_copyright = "2012-2016";
33 application_id = "org.pantheon.noise";
34 app_icon = "multimedia-audio-player";
35- app_launcher = "noise.desktop";
36+ app_launcher = "org.pantheon.noise.desktop";
37 app_years = "2012-2016";
38
39 main_url = "https://launchpad.net/noise";

Subscribers

People subscribed via source and target branches