diff --git a/debian/changelog b/debian/changelog index a384000..3268f68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ukui-notification (4.0.1.2-ok1) yangtze; urgency=medium + + * Issues: 无 + * 其他改动: + - 修复通知关闭时无关闭信号的问题 + + -- zhangpengfei Thu, 16 Nov 2023 09:20:38 +0800 + ukui-notification (4.0.1.2-ok0) yangtze; urgency=medium * Issues: https://gitee.com/openkylin/ukui-control-center/issues/I80Y9K?from=project-issue diff --git a/debian/patches/0001-Update-changelog-ukui-notification4.0.1.2-ok1.patch b/debian/patches/0001-Update-changelog-ukui-notification4.0.1.2-ok1.patch new file mode 100644 index 0000000..b7a6bd1 --- /dev/null +++ b/debian/patches/0001-Update-changelog-ukui-notification4.0.1.2-ok1.patch @@ -0,0 +1,51 @@ +From: iaom +Date: Thu, 16 Nov 2023 09:23:06 +0800 +Subject: Update changelog ukui-notification4.0.1.2-ok1 + +--- + libukui-notification/notification-client.cpp | 10 +++------- + notification-server/server.cpp | 1 + + 2 files changed, 4 insertions(+), 7 deletions(-) + +diff --git a/libukui-notification/notification-client.cpp b/libukui-notification/notification-client.cpp +index 070b8ce..e32e01e 100644 +--- a/libukui-notification/notification-client.cpp ++++ b/libukui-notification/notification-client.cpp +@@ -31,11 +31,7 @@ NotificationClientPrivate::NotificationClientPrivate(NotificationClient *q) : QO + + NotificationClientPrivate::~NotificationClientPrivate() + { +- if(m_notificationsInterface) { +- m_notificationsInterface->call(QDBus::NoBlock, QStringLiteral("UnRegisterClient")); +- delete m_notificationsInterface; +- m_notificationsInterface = nullptr; +- } ++ unregisterClient(); + } + + bool NotificationClientPrivate::init() +@@ -158,10 +154,10 @@ bool NotificationClientPrivate::closeNotification(uint id, NotificationCloseReas + if(!m_serverInterface) { + return false; + } +- QDBusMessage reply = m_serverInterface->callWithArgumentList(QDBus::NoBlock, QStringLiteral("CloseNotification"), {id, reason}); ++ QDBusMessage reply = m_serverInterface->callWithArgumentList(QDBus::BlockWithGui, QStringLiteral("CloseNotification"), {id, static_cast(reason)}); + if (reply.type() == QDBusMessage::ErrorMessage) { + qWarning() << "Failed to call CloseNotification!" << QDBusConnection::sessionBus().lastError(); +- return false; ++ return false; + } + return true; + } +diff --git a/notification-server/server.cpp b/notification-server/server.cpp +index 0e672bb..5528237 100644 +--- a/notification-server/server.cpp ++++ b/notification-server/server.cpp +@@ -174,6 +174,7 @@ void ServerPrivate::CloseNotification(uint id, uint reason) + if(m_notificationsCache.contains(id)) { + m_notificationsCache.remove(id); + } ++ qDebug() << "CloseNotification" << id << reason; + Q_EMIT NotificationClosed(id, reason); + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c2f1c9c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Update-changelog-ukui-notification4.0.1.2-ok1.patch