[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=8af0754

The following commit has been merged in the master branch:
commit 8af0754bcd8b8521445e7f562c3c4f4e44cf846d
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Nov 15 14:05:35 2011 +0100

    Check for song data only once and don't deactivate the plugin if there are no songs metadata in dbus message
    
    Reviewed-by: David Edmundson
    BUG: 286632
---
 telepathy-mpris.cpp | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 8c3f39d..2c00774 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -79,24 +79,6 @@ void TelepathyMPRIS::onPlayerSignalReceived(const QString &interface, const QVar
 
     //FIXME We can do less lame parsing...maybe.
     Q_FOREACH (const QVariant &property, changedProperties.values()) {
-        //if we're dealing with track's metadata
-        if (property.canConvert<QDBusArgument>() && changedProperties.key(property) == QLatin1String("Metadata")) {
-            QDBusArgument g = property.value<QDBusArgument>();
-            QMap<QString, QVariant> k = qdbus_cast<QMap<QString, QVariant> >(g);
-
-            //amarok sends empty metadata after the playlist has finished, so let's make sure we won't use them
-            if (k.isEmpty()) {
-                break;
-            }
-            title = k.value(QLatin1String("xesam:title")).toString();
-            artist = k.value(QLatin1String("xesam:artist")).toString();
-            album = k.value(QLatin1String("xesam:album")).toString();
-            trackInfoFound = true;
-
-            //we got what we need, bail out
-            break;
-        }
-
         if (property.canConvert<QString>()) {
             if (property.toString() == QLatin1String("Paused") || property.toString() == QLatin1String("Stopped")) {
                 setActive(false);
@@ -138,8 +120,6 @@ void TelepathyMPRIS::onPlayerSignalReceived(const QString &interface, const QVar
         if (m_presenceActivated) {
             setActive(true);
         }
-    } else {
-        setActive(false);
     }
 }
 

-- 
ktp-kded-integration-module packaging