From aa11e4f7772638d301949993ba5c11d935898a1e Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Thu, 25 Apr 2019 00:45:21 +0100
Subject: [PATCH] Avoid duplicating screensaver interface definition file

Summary:
Kwin has a mandatory dependency on kscreenlocker, we can use the
screensaver interface definition installed from there.

Test Plan: Compiles

Reviewers: #kwin, zzag

Reviewed By: #kwin, zzag

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D20764
---
 CMakeLists.txt                  |  2 +-
 autotests/CMakeLists.txt        |  2 +-
 org.freedesktop.ScreenSaver.xml | 41 ---------------------------------
 3 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 org.freedesktop.ScreenSaver.xml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e788a88d1..032bec09b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -554,7 +554,7 @@ qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS ${kwin_effects_dbus_xml} effects.h KWin:
 qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.kwin.OrientationSensor.xml orientation_sensor.h KWin::OrientationSensor)
 qt5_add_dbus_adaptor( kwin_KDEINIT_SRCS org.kde.KWin.VirtualDesktopManager.xml dbusinterface.h KWin::VirtualDesktopManagerDBusInterface )
 
-qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.ScreenSaver.xml screenlocker_interface)
+qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
 
 qt5_add_dbus_interface( kwin_KDEINIT_SRCS org.kde.kappmenu.xml appmenu_interface )
 
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index b44c793d0e..0aed9e5edc 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -320,7 +320,7 @@ set( testScreenEdges_SRCS
     ../orientation_sensor.cpp
 )
 kconfig_add_kcfg_files(testScreenEdges_SRCS ../settings.kcfgc)
-qt5_add_dbus_interface( testScreenEdges_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../org.freedesktop.ScreenSaver.xml screenlocker_interface)
+qt5_add_dbus_interface( testScreenEdges_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
 qt5_add_dbus_adaptor( testScreenEdges_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.kwin.OrientationSensor.xml ${CMAKE_CURRENT_SOURCE_DIR}/../orientation_sensor.h KWin::OrientationSensor)
 
 add_executable( testScreenEdges ${testScreenEdges_SRCS})
diff --git a/org.freedesktop.ScreenSaver.xml b/org.freedesktop.ScreenSaver.xml
deleted file mode 100644
index 5efd9433ca..0000000000
--- a/org.freedesktop.ScreenSaver.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.freedesktop.ScreenSaver">
-    <signal name="ActiveChanged">
-      <arg type="b"/>
-    </signal>
-    <method name="Lock">
-    </method>
-    <method name="SimulateUserActivity">
-    </method>
-    <method name="GetActive">
-      <arg type="b" direction="out"/>
-    </method>
-    <method name="GetActiveTime">
-      <arg name="seconds" type="u" direction="out"/>
-    </method>
-    <method name="GetSessionIdleTime">
-      <arg name="seconds" type="u" direction="out"/>
-    </method>
-    <method name="SetActive">
-      <arg type="b" direction="out"/>
-      <arg name="e" type="b" direction="in"/>
-    </method>
-    <method name="Inhibit">
-      <arg name="application_name" type="s" direction="in"/>
-      <arg name="reason_for_inhibit" type="s" direction="in"/>
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-    <method name="UnInhibit">
-      <arg name="cookie" type="u" direction="in"/>
-    </method>
-    <method name="Throttle">
-      <arg name="application_name" type="s" direction="in"/>
-      <arg name="reason_for_inhibit" type="s" direction="in"/>
-      <arg name="cookie" type="u" direction="out"/>
-    </method>
-    <method name="UnThrottle">
-      <arg name="cookie" type="u" direction="in"/>
-    </method>
-  </interface>
-</node>