From 7b527c609b6ddf5ce80fe0db8a7eae93baa7e72a Mon Sep 17 00:00:00 2001
From: ComixHe <heyuming@deepin.org>
Date: Tue, 12 Sep 2023 10:04:41 +0800
Subject: [PATCH] refact: use standard DBus interface

Signed-off-by: ComixHe <heyuming@deepin.org>
---
 src/dbus/applicationmanager1service.cpp |  4 ++--
 src/propertiesForwarder.cpp             | 17 +----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/dbus/applicationmanager1service.cpp b/src/dbus/applicationmanager1service.cpp
index 024c2fa..ff9f060 100644
--- a/src/dbus/applicationmanager1service.cpp
+++ b/src/dbus/applicationmanager1service.cpp
@@ -80,7 +80,7 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
 
     auto sessionId = getCurrentSessionId();
     if (flag.open(QFile::ReadOnly | QFile::ExistingOnly)) {
-        auto content = flag.readAll();
+        auto content = flag.read(sessionId.size());
         if (!content.isEmpty() and !sessionId.isEmpty() and content == sessionId) {
             return;
         }
@@ -88,7 +88,7 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
     }
 
     if (flag.open(QFile::WriteOnly | QFile::Truncate)) {
-        flag.write(sessionId);
+        flag.write(sessionId, sessionId.size());
     }
 
     scanAutoStart();
diff --git a/src/propertiesForwarder.cpp b/src/propertiesForwarder.cpp
index 81f965f..b22ac94 100644
--- a/src/propertiesForwarder.cpp
+++ b/src/propertiesForwarder.cpp
@@ -47,22 +47,7 @@ void PropertiesForwarder::PropertyChanged()
     auto value = sig.read(sender);
 
     auto childs = sender->children();
-    QString interface;
-    for (const auto &adaptor : childs) {
-        if (adaptor->inherits("QDBusAbstractAdaptor")) {
-            const auto *adaptorMo = adaptor->metaObject();
-            if (adaptorMo->indexOfProperty(propName) != -1) {
-                interface = getDBusInterface(adaptor->metaObject()->metaType());
-                break;
-            }
-        }
-    };
-
-    if (interface.isEmpty()) {
-        return;
-    }
-
-    auto msg = QDBusMessage::createSignal(m_path, interface, "PropertiesChanged");
+    auto msg = QDBusMessage::createSignal(m_path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
     msg << QString{ApplicationInterface};
     msg << QVariantMap{{QString{propName}, value}};
     msg << QStringList{};