summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edmundson <[email protected]>2017-05-25 09:27:06 +0100
committerDavid Edmundson <[email protected]>2017-05-25 09:27:06 +0100
commitab60c3be74a0efa07662d8f456daab8bf04637e8 (patch)
tree3fe74499af73bac195b6b2299656b4abe56858ae
parent43658f3fd6ae574a6888c82b86bd5d743b7d9867 (diff)
Fix co-installability with other DBus activated notification services
Summary: In Plasma we install a DBus activated service to handle the case of notifications being sent before Plasma is loaded. This file clashes with other notification daemons and causes distro issues. The convention is to make this file name match the DBus service name so that we can detect conflicts, however in this case we know we have an unavoidable conflict, but it doesn't really have an repurcisions other than the user having an undetermined notification daemon chosen during plasma bootup (which was the case before this patch too) Effectively it's the same problem we have with the org.freedesktop.FileManager1 service and Dolphin, and the same solution. Test Plan: Installed this kquitapp5 plasmashell notify-send some message. Confirmed it waited started plasmashell. Got the message Reviewers: #plasma, mart Reviewed By: #plasma, mart Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D5968
-rw-r--r--startkde/waitforname/CMakeLists.txt6
-rw-r--r--startkde/waitforname/org.kde.plasma.Notifications.service.in (renamed from startkde/waitforname/org.freedesktop.Notifications.service.in)0
2 files changed, 3 insertions, 3 deletions
diff --git a/startkde/waitforname/CMakeLists.txt b/startkde/waitforname/CMakeLists.txt
index c66f958..a184c25 100644
--- a/startkde/waitforname/CMakeLists.txt
+++ b/startkde/waitforname/CMakeLists.txt
@@ -13,10 +13,10 @@ target_link_libraries(plasma_waitforname
Qt5::DBus
)
-configure_file(org.freedesktop.Notifications.service.in
- ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Notifications.service)
+configure_file(org.kde.plasma.Notifications.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.Notifications.service)
install(TARGETS plasma_waitforname ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Notifications.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasma.Notifications.service
DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
diff --git a/startkde/waitforname/org.freedesktop.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in
index 0a51b84..0a51b84 100644
--- a/startkde/waitforname/org.freedesktop.Notifications.service.in
+++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in