From 1479743e702f2bfba4524ab4dae8cf1134547920 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Wed, 20 Jan 2021 16:09:25 -0500
Subject: [PATCH] Use async call in closeNotification

---
 src/notifications/ManagerLinux.cpp | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/notifications/ManagerLinux.cpp b/src/notifications/ManagerLinux.cpp
index ad9e2c21..d9d157fc 100644
--- a/src/notifications/ManagerLinux.cpp
+++ b/src/notifications/ManagerLinux.cpp
@@ -75,19 +75,17 @@ NotificationsManager::postNotification(const QString &roomid,
         static QDBusInterface notifyApp("org.freedesktop.Notifications",
                                         "/org/freedesktop/Notifications",
                                         "org.freedesktop.Notifications");
-        auto call = notifyApp.asyncCallWithArgumentList("Notify", argumentList);
-        auto watcher = new QDBusPendingCall{QDBusPendingReply{call}};
-        connect(watcher,
-                &QDBusPendingCallWatcher::finished,
-                this,
-                [watcher, this, &roomid, &eventid]() {
-                        if (watcher->reply().type() == QDBusMessage::ErrorMessage)
-                                qDebug() << "D-Bus Error:" << watcher.reply().errorMessage();
-                        else
-                                notificationIds[watcher->reply().arguments().first().toUInt()] =
-                                  roomEventId{roomid, eventid};
-                        delete watcher;
-                });
+        auto call    = notifyApp.asyncCallWithArgumentList("Notify", argumentList);
+        auto watcher = new QDBusPendingCallWatcher{QDBusPendingCall{QDBusPendingReply{call}}};
+        connect(
+          watcher, &QDBusPendingCallWatcher::finished, this, [watcher, this, &roomid, &eventid]() {
+                  if (watcher->reply().type() == QDBusMessage::ErrorMessage)
+                          qDebug() << "D-Bus Error:" << watcher->reply().errorMessage();
+                  else
+                          notificationIds[watcher->reply().arguments().first().toUInt()] =
+                            roomEventId{roomid, eventid};
+                  delete watcher;
+          });
 }
 
 void
@@ -99,11 +97,13 @@ NotificationsManager::closeNotification(uint id)
         static QDBusInterface closeCall("org.freedesktop.Notifications",
                                         "/org/freedesktop/Notifications",
                                         "org.freedesktop.Notifications");
-        QDBusMessage reply =
-          closeCall.callWithArgumentList(QDBus::AutoDetect, "CloseNotification", argumentList);
-        if (reply.type() == QDBusMessage::ErrorMessage) {
-                qDebug() << "D-Bus Error:" << reply.errorMessage();
-        }
+        auto call    = closeCall.asyncCallWithArgumentList("CloseNotification", argumentList);
+        auto watcher = new QDBusPendingCallWatcher{QDBusPendingCall{QDBusPendingReply{call}}};
+        connect(watcher, &QDBusPendingCallWatcher::finished, this, [watcher, this]() {
+                if (watcher->reply().type() == QDBusMessage::ErrorMessage) {
+                        qDebug() << "D-Bus Error:" << watcher->reply().errorMessage();
+                };
+        });
 }
 
 void