Switchboard

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

  1. correct-app-id
  2. Merge into switchboard
Proposed by Adam Bieńkowski
Status: Merged
Approved by: Danielle Foré
Approved revision: 696
Merged at revision: 696
Proposed branch: lp:~donadigo/switchboard/correct-app-id
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 30 lines (+3/-3)
2 files modified
CMakeLists.txt (+2/-2)
src/Switchboard.vala (+1/-1)
To merge this branch: bzr merge lp:~donadigo/switchboard/correct-app-id
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+310104@code.launchpad.net

Commit message

* Changed .desktop name to it's app id

Description of the change

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

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-11-01 01:16:45 +0000
3+++ CMakeLists.txt 2016-11-04 22:38:31 +0000
4@@ -68,10 +68,10 @@
5 #
6
7 include (Translations)
8-configure_file_translation(${CMAKE_SOURCE_DIR}/data/${CMAKE_PROJECT_NAME}.desktop.in ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.desktop ${CMAKE_SOURCE_DIR}/po/)
9+configure_file_translation(${CMAKE_SOURCE_DIR}/data/org.pantheon.switchboard.desktop.in ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.desktop ${CMAKE_SOURCE_DIR}/po/)
10 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/)
11
12-install(FILES ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.desktop DESTINATION ${DATADIR}/applications)
13+install(FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.desktop DESTINATION ${DATADIR}/applications)
14 install(FILES ${CMAKE_BINARY_DIR}/data/${CMAKE_PROJECT_NAME}.appdata.xml DESTINATION ${DATADIR}/appdata)
15
16 add_subdirectory(po)
17
18=== renamed file 'data/switchboard.desktop.in' => 'data/org.pantheon.switchboard.desktop.in'
19=== modified file 'src/Switchboard.vala'
20--- src/Switchboard.vala 2016-11-03 21:28:25 +0000
21+++ src/Switchboard.vala 2016-11-04 22:38:31 +0000
22@@ -66,7 +66,7 @@
23 };
24
25 construct {
26- application_id = "org.elementary.switchboard";
27+ application_id = "org.pantheon.switchboard";
28 program_name = _("System Settings");
29 app_years = "2011-2016";
30 exec_name = "switchboard";

Subscribers

People subscribed via source and target branches

to all changes: