Merge branch 'jb46120_2' into 'master'

Use SetProperty for multiple properties and drop use of SetProperties. See merge request mer-core/libconnman-qt!41
sailfishos · Jan 2, 2020 · d2e425b · d2e425b
2 parents 183f4e6 + 47591b8
commit d2e425b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/libconnman-qt/connman_vpn_connection.xml b/libconnman-qt/connman_vpn_connection.xml
@@ -6,10 +6,6 @@
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
       <arg name="properties" type="a{sv}" direction="out"/>
     </method>
-    <method name="SetProperties">
-      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-      <arg name="properties" type="a{sv}" direction="in"/>
-    </method>
     <method name="SetProperty">
       <arg name="name" type="s" direction="in"/>
       <arg name="value" type="v" direction="in"/>

diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro
@@ -4,7 +4,7 @@ QT          -= gui
 CONFIG      += qt create_pc create_prl link_pkgconfig
 
 isEmpty(VERSION) {
-    VERSION = 1.2.24
+    VERSION = 1.2.25
     message("VERSION is unset, assuming $$VERSION")
 }
 

diff --git a/libconnman-qt/vpnconnection.cpp b/libconnman-qt/vpnconnection.cpp
@@ -155,7 +155,9 @@ void VpnConnection::modifyConnection(const QVariantMap &properties)
     updatedProperties.remove(QString("immutable"));
     updatedProperties.remove(QString("storeCredentials"));
 
-    d->m_connectionProxy.SetProperties(MarshalUtils::propertiesToDBus(updatedProperties));
+    // SetProperty supports a single property or an array of properties
+    d->m_connectionProxy.SetProperty(QString("Properties"),
+        QDBusVariant(MarshalUtils::propertiesToDBus(updatedProperties)));
 }
 
 void VpnConnection::activate()

diff --git a/rpm/connman-qt5.spec b/rpm/connman-qt5.spec
@@ -1,12 +1,12 @@
 Name:       connman-qt5
 Summary:    Qt bindings for connman
-Version:    1.2.24
+Version:    1.2.25
 Release:    1
 Group:      System/GUI/Other
 License:    ASL 2.0
 URL:        https://git.sailfishos.org/mer-core/libconnman-qt
 Source0:    %{name}-%{version}.tar.bz2
-Requires:   connman >= 1.32+git104
+Requires:   connman >= 1.32+git107
 Requires:   libdbusaccess >= 1.0.4
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig