Minor fixes

Avoid some detaching if possible; avoid excessive checking; note when Seeked was received

2 files changed, 10 insertions, 8 deletions

diff --git a/mpris2/interfacetest.cpp b/mpris2/interfacetest.cpp
index 11fdd84..7265bab 100644
--- a/mpris2/interfacetest.cpp
+++ b/mpris2/interfacetest.cpp
@@ -124,9 +124,9 @@ bool InterfaceTest::checkPropValid(const QString& propName, QVariant::Type expTy
     if (!props.contains(propName)) {
         emit interfaceError(Property, propName, "Property " + propName + " is missing");
         return false;
-    } else if (props[propName].type() != expType) {
+    } else if (props.value(propName).type() != expType) {
         // FIXME: generate D-Bus type description
-        const char * gotTypeCh = QDBusMetaType::typeToSignature(props[propName].userType());
+        const char * gotTypeCh = QDBusMetaType::typeToSignature(props.value(propName).userType());
         QString gotType = gotTypeCh ? QString::fromAscii(gotTypeCh) : "<unknown>";
         const char * expTypeCh = QDBusMetaType::typeToSignature(expType);
         QString expType = expTypeCh ? QString::fromAscii(expTypeCh) : "<unknown>";
@@ -135,16 +135,17 @@ bool InterfaceTest::checkPropValid(const QString& propName, QVariant::Type expTy
         return false;
     } else if (oldProps.contains(propName)) {
         // FIXME: QVariant equality only works for builtin types
-        if (props[propName].type() < QVariant::UserType) {
-            if (props[propName] != oldProps[propName]) {
-                outOfDateProperties.insert(propName, props[propName]);
-                props[propName] = oldProps[propName];
-                // don't check right now
-                return false;
+        if (props.value(propName).type() < QVariant::UserType) {
+            if (props.value(propName) != oldProps.value(propName)) {
+                outOfDateProperties.insert(propName, props.value(propName));
+                props[propName] = oldProps.value(propName);
             }
         } else {
             qDebug() << "Could not check equality for" << propName;
         }
+        // we have either already checked this, or we will check it
+        // soon
+        return false;
     }
     return true;
 }
diff --git a/mpris2/playerinterfacetest.cpp b/mpris2/playerinterfacetest.cpp
index ee1225a..278fa81 100644
--- a/mpris2/playerinterfacetest.cpp
+++ b/mpris2/playerinterfacetest.cpp
@@ -521,6 +521,7 @@ void PlayerInterfaceTest::updateCurrentRate()
 
 void PlayerInterfaceTest::_m_seeked(qint64 position, const QDBusMessage& message)
 {
+    emit interfaceInfo(Signal, "Seeked", "Got Seeked(" + QString::number(position) + ") signal");
     m_pos = position;
     m_posLastUpdated = QTime::currentTime();
     props["Position"] = position;