[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e869fc0

The following commit has been merged in the master branch:
commit e869fc019ff85dee68f95467330f6a19fdda3d8e
Author: Lukáš Tinkl <lukas at kde.org>
Date:   Mon Nov 10 18:38:24 2014 +0100

    give missed calls and SMSs persistent status
    
    see https://plus.google.com/108821248346337473429/posts/jYbeLLZCL9H
---
 plugins/pausemusic/pausemusicplugin.h |  2 +-
 plugins/ping/pingplugin.cpp           |  2 +-
 plugins/telephony/telephonyplugin.cpp | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/pausemusic/pausemusicplugin.h b/plugins/pausemusic/pausemusicplugin.h
index aba9eb5..76c08c0 100644
--- a/plugins/pausemusic/pausemusicplugin.h
+++ b/plugins/pausemusic/pausemusicplugin.h
@@ -37,7 +37,7 @@ public:
 
 public Q_SLOTS:
     virtual bool receivePackage(const NetworkPackage& np);
-    virtual void connected() { };
+    virtual void connected() { }
 
     /**
      * @returns 0 if not muted, 1 if muted or -1 if there was an error
diff --git a/plugins/ping/pingplugin.cpp b/plugins/ping/pingplugin.cpp
index d1de135..0f73626 100644
--- a/plugins/ping/pingplugin.cpp
+++ b/plugins/ping/pingplugin.cpp
@@ -31,7 +31,7 @@
 
 K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PingPlugin >(); )
 
-Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_PING, "kdeconnect.plugin.ping");
+Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_PING, "kdeconnect.plugin.ping")
 
 PingPlugin::PingPlugin(QObject* parent, const QVariantList& args)
     : KdeConnectPlugin(parent, args)
diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp
index 0c51e63..6ab63f0 100644
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@ -43,6 +43,7 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
     const QString phoneNumber = np.get<QString>("phoneNumber", i18n("unknown number"));
 
     QString content, type, icon;
+    KNotification::NotificationFlags flags = KNotification::CloseOnTimeout;
 
     const QString title = device()->name();
 
@@ -54,26 +55,28 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
         type = "missedCall";
         icon = "call-start";
         content = i18n("Missed call from %1", phoneNumber);
+        flags = KNotification::Persistent;
     } else if (event == "sms") {
         type = "smsReceived";
         icon = "mail-receive";
         QString messageBody = np.get<QString>("messageBody","");
         content = i18n("SMS from %1: %2", phoneNumber, messageBody);
+        flags = KNotification::Persistent;
     } else if (event == "talking") {
         return NULL;
     } else {
-#ifdef NDEBUG
+#ifndef NDEBUG
         return NULL;
 #else
         type = "unknownEvent";
-        icon = "pda";
-        content = i18n("Unknown telephony event: %2", event);
+        icon = "phone";
+        content = i18n("Unknown telephony event: %1", event);
 #endif
     }
 
     qCDebug(KDECONNECT_PLUGIN_TELEPHONY) << "Creating notification with type:" << type;
 
-    KNotification* notification = new KNotification(type, KNotification::CloseOnTimeout, this); //, KNotification::Persistent
+    KNotification* notification = new KNotification(type, flags, this);
     notification->setPixmap(QIcon::fromTheme(icon).pixmap(48, 48));
     notification->setComponentName("kdeconnect");
     notification->setTitle(title);

-- 
kdeconnect packaging