Files

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

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

Subscribers

People subscribed via source and target branches

to all changes: