• R/O
  • HTTP
  • SSH
  • HTTPS

kde-workspace: Commit

Katana workspace


Commit MetaInfo

Revision64b239e4169225fad0e5025c84f72561a1fb9146 (tree)
Time2022-09-27 21:04:27
AuthorIvailo Monev <xakepa10@gmai...>
CommiterIvailo Monev

Log Message

generic: use the new kde4_add_dbus_service() macro

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

Change Summary

Incremental Difference

--- a/kcontrol/kfontinst/dbus/CMakeLists.txt
+++ b/kcontrol/kfontinst/dbus/CMakeLists.txt
@@ -7,9 +7,6 @@ include_directories(
77 )
88 add_definitions(${QT_DEFINITIONS})
99
10-# for dbus_add_activation_service
11-include(MacroDBusAddActivationService)
12-
1310 set(fontinst_bin_SRCS FcConfig.cpp FontInst.cpp Folder.cpp Main.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} )
1411 set(fontinst_helper_SRCS FcConfig.cpp Helper.cpp Folder.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} )
1512
@@ -32,6 +29,6 @@ install(TARGETS fontinst_bin DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} )
3229 install(TARGETS fontinst_helper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} )
3330 install(PROGRAMS fontinst_x11 DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
3431
35-dbus_add_activation_service(org.kde.fontinst.service.in)
32+kde4_add_dbus_service(org.kde.fontinst.service.in)
3633
3734 kde4_install_auth_helper_files(fontinst_helper org.kde.fontinst root)
--- a/kglobalaccel/CMakeLists.txt
+++ b/kglobalaccel/CMakeLists.txt
@@ -1,8 +1,5 @@
11 project(kglobalaccel)
22
3-# for dbus_add_activation_service
4-include(MacroDBusAddActivationService)
5-
63 ###############################################################################
74 ### KDED Global Accel Daemon
85
@@ -37,4 +34,4 @@ install( FILES kglobalaccel.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
3734 # KNotify configuration
3835 install( FILES kglobalaccel.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kglobalaccel)
3936
40-dbus_add_activation_service(org.kde.kglobalaccel.service.in)
37+kde4_add_dbus_service(org.kde.kglobalaccel.service.in)
--- a/knotify/CMakeLists.txt
+++ b/knotify/CMakeLists.txt
@@ -1,6 +1,3 @@
1-# for dbus_add_activation_service
2-include(MacroDBusAddActivationService)
3-
41 add_subdirectory( sounds )
52
63 ########### next target ###############
@@ -55,4 +52,4 @@ install( FILES ${knotifyplugin_HEADERS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
5552
5653 ########### D-Bus Autostart Services #########
5754
58-dbus_add_activation_service(org.kde.knotify.service.in)
55+kde4_add_dbus_service(org.kde.knotify.service.in)
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -1,8 +1,5 @@
11 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1207)
22
3-# for dbus_add_activation_service
4-include(MacroDBusAddActivationService)
5-
63 include_directories(
74 ${CMAKE_SOURCE_DIR}/libs/ksysguard
85 ${CMAKE_SOURCE_DIR}/libs/ksysguard/processcore
@@ -48,7 +45,7 @@ kde4_add_kcfg_files(krunner_SRCS ${krunner_KCFG_SRCS})
4845
4946 qt4_add_dbus_adaptor(krunner_SRCS ${krunner_dbusAppXML} krunnerapp.h KRunnerApp)
5047
51-dbus_add_activation_service(dbus/org.kde.krunner.service.in)
48+kde4_add_dbus_service(dbus/org.kde.krunner.service.in)
5249
5350 set(krunner_SRCS
5451 ${krunner_SRCS}
--- a/kuiserver/CMakeLists.txt
+++ b/kuiserver/CMakeLists.txt
@@ -4,9 +4,6 @@ endif()
44
55 include_directories(${KDE4_KIO_INCLUDES})
66
7-# for dbus_add_activation_service
8-include(MacroDBusAddActivationService)
9-
107 set(kuiserver_SRCS
118 main.cpp
129 jobview.cpp
@@ -35,7 +32,7 @@ qt4_add_dbus_interface(kuiserver_SRCS ${jobviewserver_xml} jobviewserver_interfa
3532
3633 qt4_add_dbus_adaptor(kuiserver_SRCS org.kde.kuiserver.xml progresslistmodel.h ProgressListModel kuiserveradaptor)
3734
38-dbus_add_activation_service(org.kde.kuiserver.service.in)
35+kde4_add_dbus_service(org.kde.kuiserver.service.in)
3936
4037 #</DBus Stuff>
4138
Show on old repository browser