Fixed reading properties of VoiceCall

2 files changed, 8 insertions, 4 deletions

diff --git a/daemon/voicecallhandler.cpp b/daemon/voicecallhandler.cpp
index 8e43fb3..1a006f1 100644
--- a/daemon/voicecallhandler.cpp
+++ b/daemon/voicecallhandler.cpp
@@ -172,10 +172,13 @@ method return sender=:1.13 -> dest=:1.150 reply_serial=2
         QTimer::singleShot(2000, this, SLOT(initialize()));
         if(notifyError) emit this->error("Failed to connect to VCM D-Bus service.");
     } else {
-        QDBusReply<QVariantMap> reply = d->interface->call("getProperties");
+        QDBusInterface props(d->interface->service(), d->interface->path(),
+                             "org.freedesktop.DBus.Properties", d->interface->connection());
+
+        QDBusReply<QVariantMap> reply = props.call("GetAll", d->interface->interface());
         if (reply.isValid()) {
             QVariantMap props = reply.value();
-            qDebug() << "VoiceCallHandler::initialize:" << props;
+            qDebug() << props;
             d->providerId = props["providerId"].toString();
             d->duration = props["duration"].toInt();
             d->status = props["status"].toInt();
@@ -193,7 +196,8 @@ method return sender=:1.13 -> dest=:1.150 reply_serial=2
             emit emergencyChanged();
             emit forwardedChanged();
         } else if (notifyError) {
-            emit this->error("Failed to getProperties() from VCM D-Bus service.");
+            qWarning() << "Failed to get VoiceCall properties from VCM D-Bus service.";
+            emit this->error("Failed to get VoiceCall properties from VCM D-Bus service.");
         }
     }
 }
diff --git a/daemon/voicecallmanager.cpp b/daemon/voicecallmanager.cpp
index 79ab797..90a3812 100644
--- a/daemon/voicecallmanager.cpp
+++ b/daemon/voicecallmanager.cpp
@@ -65,8 +65,8 @@ void VoiceCallManager::initialize(bool notifyError)
         success &= (bool)QObject::connect(d->interface, SIGNAL(microphoneMutedChanged()), SIGNAL(microphoneMutedChanged()));
         success &= (bool)QObject::connect(d->interface, SIGNAL(speakerMutedChanged()), SIGNAL(speakerMutedChanged()));
 
-        onActiveVoiceCallChanged();
         onVoiceCallsChanged();
+        onActiveVoiceCallChanged();
     }
 
     if(!(d->connected = success))