From cb3830e6c734951dda3934f88e8b47e351ca9daa Mon Sep 17 00:00:00 2001
From: Wang Zichong <wangzichong@deepin.org>
Date: Thu, 25 Dec 2025 16:36:41 +0800
Subject: [PATCH] move some files around

---
 CMakeLists.txt                                |  6 +-
 .../dbus/org.deepin.dde.TrayManager1.xml      |  0
 traylist.h => api/types/traylist.h            |  0
 fdoselectionmanager.cpp                       |  1 +
 org.kde.StatusNotifierItem.xml                | 63 -------------------
 org.kde.StatusNotifierWatcher.xml             | 42 -------------
 6 files changed, 4 insertions(+), 108 deletions(-)
 rename org.deepin.dde.TrayManager1.xml => api/dbus/org.deepin.dde.TrayManager1.xml (100%)
 rename traylist.h => api/types/traylist.h (100%)
 delete mode 100644 org.kde.StatusNotifierItem.xml
 delete mode 100644 org.kde.StatusNotifierWatcher.xml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b03d4ad..bfabd0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,12 +24,12 @@ set(XEMBED_SNI_PROXY_SOURCES
  )
 
 set_source_files_properties(
-    ${CMAKE_CURRENT_SOURCE_DIR}/org.deepin.dde.TrayManager1.xml
-    PROPERTIES  INCLUDE traylist.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/api/dbus/org.deepin.dde.TrayManager1.xml
+    PROPERTIES  INCLUDE api/types/traylist.h
                 CLASSNAME TrayManager
 )
 
-qt_add_dbus_adaptor(XEMBED_SNI_PROXY_SOURCES org.deepin.dde.TrayManager1.xml traymanager1.h TrayManager1)
+qt_add_dbus_adaptor(XEMBED_SNI_PROXY_SOURCES api/dbus/org.deepin.dde.TrayManager1.xml traymanager1.h TrayManager1)
 
 add_executable(xembed-traymanager-proxy ${XEMBED_SNI_PROXY_SOURCES})
 set_property(TARGET xembed-traymanager-proxy PROPERTY AUTOMOC ON)
diff --git a/org.deepin.dde.TrayManager1.xml b/api/dbus/org.deepin.dde.TrayManager1.xml
similarity index 100%
rename from org.deepin.dde.TrayManager1.xml
rename to api/dbus/org.deepin.dde.TrayManager1.xml
diff --git a/traylist.h b/api/types/traylist.h
similarity index 100%
rename from traylist.h
rename to api/types/traylist.h
diff --git a/fdoselectionmanager.cpp b/fdoselectionmanager.cpp
index 6448711..37a1fdc 100644
--- a/fdoselectionmanager.cpp
+++ b/fdoselectionmanager.cpp
@@ -2,6 +2,7 @@
     Registers as a embed container
     SPDX-FileCopyrightText: 2015 David Edmundson <davidedmundson@kde.org>
     SPDX-FileCopyrightText: 2019 Konrad Materka <materka@gmail.com>
+    SPDX-FileCopyrightText: 2025 Wang Zichong <wangzichong@deepin.org>
 
     SPDX-License-Identifier: LGPL-2.1-or-later
 */
diff --git a/org.kde.StatusNotifierItem.xml b/org.kde.StatusNotifierItem.xml
deleted file mode 100644
index 0cd7edb..0000000
--- a/org.kde.StatusNotifierItem.xml
+++ /dev/null
@@ -1,63 +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>
-  <!-- This is a minimally cut down version of the interface only implementing the
-    methods and properties used by xembedsniproxy -->
-  <interface name="org.kde.StatusNotifierItem">
-
-    <property name="Category" type="s" access="read"/>
-    <property name="Id" type="s" access="read"/>
-    <property name="Title" type="s" access="read"/>
-    <property name="Status" type="s" access="read"/>
-    <property name="WindowId" type="i" access="read"/>
-
-    <property name="ItemIsMenu" type="b" access="read"/>
-
-
-    <property name="IconPixmap" type="(iiay)" access="read">
-      <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
-    </property>
-
-    <!-- interaction: the systemtray wants the application to do something -->
-    <method name="ContextMenu">
-        <!-- we're passing the coordinates of the icon, so the app knows where to put the popup window -->
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
-    </method>
-
-    <method name="Activate">
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
-    </method>
-
-    <method name="SecondaryActivate">
-        <arg name="x" type="i" direction="in"/>
-        <arg name="y" type="i" direction="in"/>
-    </method>
-
-    <method name="Scroll">
-      <arg name="delta" type="i" direction="in"/>
-      <arg name="orientation" type="s" direction="in"/>
-    </method>
-
-    <!-- Signals: the client wants to change something in the status-->
-    <signal name="NewTitle">
-    </signal>
-
-    <signal name="NewIcon">
-    </signal>
-
-    <signal name="NewAttentionIcon">
-    </signal>
-
-    <signal name="NewOverlayIcon">
-    </signal>
-
-    <signal name="NewToolTip">
-    </signal>
-
-    <signal name="NewStatus">
-      <arg name="status" type="s"/>
-    </signal>
-
-  </interface>
-</node>
diff --git a/org.kde.StatusNotifierWatcher.xml b/org.kde.StatusNotifierWatcher.xml
deleted file mode 100644
index 2eb1a7a..0000000
--- a/org.kde.StatusNotifierWatcher.xml
+++ /dev/null
@@ -1,42 +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.kde.StatusNotifierWatcher">
-
-    <!-- methods -->
-    <method name="RegisterStatusNotifierItem">
-       <arg name="service" type="s" direction="in"/>
-    </method>
-
-    <method name="RegisterStatusNotifierHost">
-       <arg name="service" type="s" direction="in"/>
-    </method>
-
-
-    <!-- properties -->
-
-    <property name="RegisteredStatusNotifierItems" type="as" access="read">
-       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/>
-    </property>
-
-    <property name="IsStatusNotifierHostRegistered" type="b" access="read"/>
-
-    <property name="ProtocolVersion" type="i" access="read"/>
-
-
-    <!-- signals -->
-
-    <signal name="StatusNotifierItemRegistered">
-        <arg type="s"/>
-    </signal>
-
-    <signal name="StatusNotifierItemUnregistered">
-        <arg type="s"/>
-    </signal>
-
-    <signal name="StatusNotifierHostRegistered">
-    </signal>
-
-    <signal name="StatusNotifierHostUnregistered">
-    </signal>
-  </interface>
-</node>