d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the class D-Bus member

Browse source
This commit is contained in:
Loren Burkholder 2021-02-15 16:52:19 -05:00 committed by Nicolas Werner
parent 8d3e463fa6
commit ae7468a716
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/notifications/ManagerLinux.cpp
View file

@ -62,10 +62,7 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
const auto text = utils::event_body(notification.event); const auto text = utils::event_body(notification.event);
auto formattedText = utils::markdownToHtml(text); auto formattedText = utils::markdownToHtml(text);
static QDBusInterface notifyApp("org.freedesktop.Notifications", auto capabilites = dbus.call("GetCapabilites");
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications");
auto capabilites = notifyApp.call("GetCapabilites");
if (!capabilites.arguments().contains("body-markup")) if (!capabilites.arguments().contains("body-markup"))
formattedText = QTextDocumentFragment::fromHtml(formattedText).toPlainText(); formattedText = QTextDocumentFragment::fromHtml(formattedText).toPlainText();
@ -94,7 +91,7 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
argumentList << hints; // hints argumentList << hints; // hints
argumentList << (int)-1; // timeout in ms argumentList << (int)-1; // timeout in ms
QDBusPendingCall call = notifyApp.asyncCallWithArgumentList("Notify", argumentList); QDBusPendingCall call = dbus.asyncCallWithArgumentList("Notify", argumentList);
auto watcher = new QDBusPendingCallWatcher{call, this}; auto watcher = new QDBusPendingCallWatcher{call, this};
connect( connect(
watcher, &QDBusPendingCallWatcher::finished, this, [watcher, this, room_id, event_id]() { watcher, &QDBusPendingCallWatcher::finished, this, [watcher, this, room_id, event_id]() {
@ -110,10 +107,7 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
void void
NotificationsManager::closeNotification(uint id) NotificationsManager::closeNotification(uint id)
{ {
static QDBusInterface closeCall("org.freedesktop.Notifications", auto call = dbus.asyncCall("CloseNotification", (uint)id); // replace_id
"/org/freedesktop/Notifications",
"org.freedesktop.Notifications");
auto call = closeCall.asyncCall("CloseNotification", (uint)id); // replace_id
auto watcher = new QDBusPendingCallWatcher{call, this}; auto watcher = new QDBusPendingCallWatcher{call, this};
connect(watcher, &QDBusPendingCallWatcher::finished, this, [watcher]() { connect(watcher, &QDBusPendingCallWatcher::finished, this, [watcher]() {
if (watcher->reply().type() == QDBusMessage::ErrorMessage) { if (watcher->reply().type() == QDBusMessage::ErrorMessage) {