Update CallBarring class to be in sync with latest oFono

3 files changed, 4 insertions, 27 deletions

diff --git a/lib/ofonocallbarring.cpp b/lib/ofonocallbarring.cpp
index 8c60d09..2907b6d 100644
--- a/lib/ofonocallbarring.cpp
+++ b/lib/ofonocallbarring.cpp
@@ -52,24 +52,8 @@ void OfonoCallBarring::pathChanged(const QString& path)
     connectDbusSignals(path);
 }
 
-void OfonoCallBarring::connectDbusSignals(const QString& path)
-{
-    QDBusConnection::systemBus().disconnect("org.ofono", QString(), m_if->ifname(), 
-					 "IncomingBarringInEffect",
-					 this,
-					 SIGNAL(incomingBarringInEffect()));
-    QDBusConnection::systemBus().disconnect("org.ofono", QString(), m_if->ifname(), 
-					 "OutgoingBarringInEffect",
-					 this,
-					 SIGNAL(outgoingBarringInEffect()));
-    QDBusConnection::systemBus().connect("org.ofono", path, m_if->ifname(), 
-					 "IncomingBarringInEffect",
-					 this,
-					 SIGNAL(incomingBarringInEffect()));
-    QDBusConnection::systemBus().connect("org.ofono", path, m_if->ifname(), 
-					 "OutgoingBarringInEffect",
-					 this,
-					 SIGNAL(outgoingBarringInEffect()));
+void OfonoCallBarring::connectDbusSignals(const QString& /*path*/)
+{
 }
 
 void OfonoCallBarring::changePassword(const QString &old_password, 
@@ -171,9 +155,9 @@ void OfonoCallBarring::setPropertyFailed(const QString& property)
 void OfonoCallBarring::requestPropertyComplete(bool success, const QString& property, const QVariant& value)
 {
     if (property == "VoiceIncoming") {	
-        success ? emit voiceIncomingComplete(true, value.value<QString>()) : emit voiceIncomingComplete(false, QString());
+        emit voiceIncomingComplete(success, value.value<QString>());
     } else if (property == "VoiceOutgoing") {	
-        success ? emit voiceOutgoingComplete(true, value.value<QString>()) : emit voiceOutgoingComplete(false, QString());
+        emit voiceOutgoingComplete(success, value.value<QString>());
     }
 }
 
diff --git a/lib/ofonocallbarring.h b/lib/ofonocallbarring.h
index 76315b3..3c3d682 100644
--- a/lib/ofonocallbarring.h
+++ b/lib/ofonocallbarring.h
@@ -56,9 +56,6 @@ public slots:
     void disableAllOutgoing(const QString &password);
 
 signals:
-    void incomingBarringInEffect();
-    void outgoingBarringInEffect();
-
     void voiceIncomingComplete(bool success, const QString &barrings);
     void voiceOutgoingComplete(bool success, const QString &barrings);
     void voiceIncomingChanged(const QString &barrings);
diff --git a/tests/test_ofonocallbarring.cpp b/tests/test_ofonocallbarring.cpp
index c85693e..0da7424 100644
--- a/tests/test_ofonocallbarring.cpp
+++ b/tests/test_ofonocallbarring.cpp
@@ -60,10 +60,6 @@ private slots:
         QSignalSpy setVoiceIncomingFailed(m, SIGNAL(setVoiceIncomingFailed()));
         QSignalSpy setVoiceOutgoingFailed(m, SIGNAL(setVoiceOutgoingFailed()));
 
-        // These two are unused until we support a voicecall API
-        QSignalSpy incomingBarringInEffect(m, SIGNAL(incomingBarringInEffect()));
-        QSignalSpy outgoingBarringInEffect(m, SIGNAL(outgoingBarringInEffect()));        
-
         QSignalSpy changePasswordComplete(m, SIGNAL(changePasswordComplete(bool)));
         QSignalSpy disableAllComplete(m, SIGNAL(disableAllComplete(bool)));
         QSignalSpy disableAllIncomingComplete(m, SIGNAL(disableAllIncomingComplete(bool)));