[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=4408afe

The following commit has been merged in the master branch:
commit 4408afece1fa2efb7e233ec7b3f68ff513ad83fa
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Aug 18 20:25:31 2013 +0200

    Fixed pausemusic plugin
    
    PauseWhenRinging logic was wrong
    Removed qDebugs
---
 daemon/plugins/pausemusic/pausemusicplugin.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/daemon/plugins/pausemusic/pausemusicplugin.cpp b/daemon/plugins/pausemusic/pausemusicplugin.cpp
index bb69a95..31055ea 100644
--- a/daemon/plugins/pausemusic/pausemusicplugin.cpp
+++ b/daemon/plugins/pausemusic/pausemusicplugin.cpp
@@ -41,20 +41,29 @@ PauseMusicPlugin::PauseMusicPlugin(QObject* parent, const QVariantList& args)
 
 bool PauseMusicPlugin::receivePackage(const NetworkPackage& np)
 {
-    if (np.type() != PACKAGE_TYPE_TELEPHONY) return false;
 
-    //TODO: Test this logic again
+    if (np.type() != PACKAGE_TYPE_TELEPHONY) {
+        return false;
+    }
+
+
     if (pauseWhen == PauseWhenRinging) {
-        if (np.get<QString>("event") != "ringing" || np.get<QString>("event") != "talking") return false;
-    } else if (pauseWhen == PauseWhenTalking){
-        if (np.get<QString>("event") != "talking") return false;
+
+        if (np.get<QString>("event") != "ringing" && np.get<QString>("event") != "talking") {
+            return true;
+        }
+
+    } else if (pauseWhen == PauseWhenTalking) {
+
+        if (np.get<QString>("event") != "talking") {
+            return true;
+        }
+
     }
 
 
     bool pauseConditionFulfilled = !np.get<bool>("isCancel");
 
-    qDebug() << "PauseMusicPackageReceiver - PauseCondition:" << pauseConditionFulfilled;
-
     if (pauseConditionFulfilled) {
         //Search for interfaces currently playing
         QStringList interfaces = QDBusConnection::sessionBus().interface()->registeredServiceNames().value();

-- 
kdeconnect packaging