Merge lp:~jeremywootten/pantheon-files/change-FileManager1-service-filename into lp:~elementary-apps/pantheon-files/trunk

Proposed by Jeremy Wootten
Status: Merged
Approved by: Danielle Foré
Approved revision: 2561
Merged at revision: 2563
Proposed branch: lp:~jeremywootten/pantheon-files/change-FileManager1-service-filename
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 20 lines (+2/-2)
1 file modified
data/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/change-FileManager1-service-filename
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+324188@code.launchpad.net

Commit message

Changed to io.elementary.pantheon-files.FileManager1.service to avoid conflit with the one supplied by Nautilus

Description of the change

The name of the dbus service file for the org.freedesktop.FileManager1 service is changed to io.elementary.pantheon-files.FileManager1.service to avoid clash with the one supplied by Nautilus.

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 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2017-05-08 10:39:31 +0000
3+++ data/CMakeLists.txt 2017-05-17 15:51:37 +0000
4@@ -1,7 +1,7 @@
5 include (Translations)
6
7 configure_file(pantheon-files.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service)
8-configure_file(pantheon-files-filemanager1.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.FileManager1.service)
9+configure_file(pantheon-files-filemanager1.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.pantheon-files.FileManager1.service)
10 configure_file(pantheon-files-pkexec.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec)
11 configure_file(net.launchpad.pantheon-files.policy.xml.in.in ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy.xml.in)
12
13@@ -12,7 +12,7 @@
14 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.appdata.xml DESTINATION share/appdata)
15 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.desktop DESTINATION share/applications)
16 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service DESTINATION share/dbus-1/services/)
17-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.FileManager1.service DESTINATION share/dbus-1/services/)
18+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.pantheon-files.FileManager1.service DESTINATION share/dbus-1/services/)
19 install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec DESTINATION bin)
20 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy DESTINATION share/polkit-1/actions/)
21

Subscribers

People subscribed via source and target branches

to all changes: