[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:26 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=70f55d0
The following commit has been merged in the master branch:
commit 70f55d0ebcd67fb64c24450170b88386c2c70494
Author: Aleix Pol <aleixpol at kde.org>
Date: Mon Dec 7 03:21:35 2015 +0100
Fix compilation and a couple of warnings
CCMAIL: holger.k at elberer.de
---
plugins/notifications/notificationslistener.cpp | 9 +++++----
plugins/notifications/notificationslistener.h | 2 +-
tests/testnotificationlistener.cpp | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/plugins/notifications/notificationslistener.cpp b/plugins/notifications/notificationslistener.cpp
index 7e643af..c5f9563 100644
--- a/plugins/notifications/notificationslistener.cpp
+++ b/plugins/notifications/notificationslistener.cpp
@@ -125,11 +125,12 @@ uint NotificationsListener::Notify(const QString &appName, uint replacesId,
return 0;
int urgency = -1;
- bool ok;
- if (hints.contains("urgency"))
+ if (hints.contains("urgency")) {
+ bool ok;
urgency = hints["urgency"].toInt(&ok);
- if (!ok)
- urgency = -1;
+ if (!ok)
+ urgency = -1;
+ }
if (urgency > -1 && urgency < mPlugin->config()->get<int>("generalUrgency", 0))
return 0;
diff --git a/plugins/notifications/notificationslistener.h b/plugins/notifications/notificationslistener.h
index b3d2b46..dfa37b8 100644
--- a/plugins/notifications/notificationslistener.h
+++ b/plugins/notifications/notificationslistener.h
@@ -24,7 +24,7 @@
class KdeConnectPlugin;
class NotificationsDbusInterface;
class Notification;
-class NotifyingApplication;
+struct NotifyingApplication;
class NotificationsListener : public QDBusAbstractAdaptor
{
diff --git a/tests/testnotificationlistener.cpp b/tests/testnotificationlistener.cpp
index 6219d27..b80d864 100644
--- a/tests/testnotificationlistener.cpp
+++ b/tests/testnotificationlistener.cpp
@@ -141,7 +141,7 @@ void TestNotificationListener::testNotify()
plugin->config()->set("generalUrgency", 0);
QCOMPARE(plugin->config()->get<bool>("generalPersistent"), false);
QCOMPARE(plugin->config()->get<bool>("generalIncludeBody"), true);
- QCOMPARE(plugin->config()->get<bool>("generalUrgency"), 0);
+ QCOMPARE(plugin->config()->get<bool>("generalUrgency"), false);
// applications are modified directly:
listener->getApplications().clear();
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list