[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:55 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c154d97
The following commit has been merged in the master branch:
commit c154d9702b40dcfb66d4668647456583b8cbacf9
Author: Albert Vaca <albertvaka at gmail.com>
Date: Wed Jun 22 12:47:12 2016 +0200
Only return if telepathy actually handles the message
---
plugins/telephony/telephonyplugin.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp
index 5942873..8957e89 100644
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@ -25,7 +25,7 @@
#include <KLocalizedString>
#include <QIcon>
#include <QDebug>
-#include <QDBusPendingCall>
+#include <QDBusReply>
#include <KPluginFactory>
@@ -51,8 +51,12 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
if (event == QLatin1String("sms") && m_telepathyInterface.isValid()) {
qCDebug(KDECONNECT_PLUGIN_TELEPHONY) << "Passing a text message to the telepathy interface";
const QString messageBody = np.get<QString>("messageBody","");
- m_telepathyInterface.asyncCall("sendMessage", phoneNumber, contactName, messageBody);
- return nullptr;
+ QDBusReply<bool> reply = m_telepathyInterface.call("sendMessage", phoneNumber, contactName, messageBody);
+ if (reply) {
+ return nullptr;
+ } else {
+ qCDebug(KDECONNECT_PLUGIN_TELEPHONY) << "Telepathy failed, falling back to the default handling";
+ }
}
QString content, type, icon;
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list