From caae9fcc100c38f343c157045e2268bcf35daa71 Mon Sep 17 00:00:00 2001 From: myml Date: Fri, 19 Jul 2024 15:43:45 +0800 Subject: [PATCH] fix: cloud sync dbus error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复云同步连接错误 Log: --- calendar-service/src/dbus/dunioniddbus.cpp | 11 ++++++++--- debian/changelog | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/calendar-service/src/dbus/dunioniddbus.cpp b/calendar-service/src/dbus/dunioniddbus.cpp index 833f8cdd..ef2f8a15 100644 --- a/calendar-service/src/dbus/dunioniddbus.cpp +++ b/calendar-service/src/dbus/dunioniddbus.cpp @@ -4,14 +4,19 @@ #include "dunioniddbus.h" #include "commondef.h" +#include DUnionIDDbus::DUnionIDDbus(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) { - if (!this->isValid()) { + auto reply = this->SwitcherDump(); + reply.waitForFinished(); + if (!reply.isValid()) { qCWarning(ServiceLogger) << "Error connecting remote object, service:" << this->service() << ",path:" << this->path() << ",interface" << this->interface(); - qCWarning(ServiceLogger) << this->lastError(); - + qCWarning(ServiceLogger) << reply.error(); + } else { + qCInfo(ServiceLogger) << "connected remote object, service:" << this->service() << ",path:" << this->path() << ",interface" << this->interface(); + qCInfo(ServiceLogger) << "switcher dump" << reply.value(); } } diff --git a/debian/changelog b/debian/changelog index b5357989..f5daa417 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dde-calendar (5.14.1) unstable; urgency=medium + + * fix: cloud sync dbus error + + -- myml Mon, 22 Jul 2024 10:41:23 +0800 + dde-calendar (5.14.0) unstable; urgency=medium * fix: build error in uos system