Merge branch 'jb46120' into 'master'

Set multiple VPN properties with one D-Bus call using SetProperty. See merge request mer-core/libconnman-qt!39
sailfishos · Dec 10, 2019 · 183f4e6 · 183f4e6
2 parents 9459693 + f852d98
commit 183f4e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/libconnman-qt/connman_vpn_connection.xml b/libconnman-qt/connman_vpn_connection.xml
@@ -6,6 +6,10 @@
       <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.23
+    VERSION = 1.2.24
     message("VERSION is unset, assuming $$VERSION")
 }
 

diff --git a/libconnman-qt/vpnconnection.cpp b/libconnman-qt/vpnconnection.cpp
@@ -155,10 +155,7 @@ void VpnConnection::modifyConnection(const QVariantMap &properties)
     updatedProperties.remove(QString("immutable"));
     updatedProperties.remove(QString("storeCredentials"));
 
-    QVariantMap dbusProps = MarshalUtils::propertiesToDBus(updatedProperties);
-    for (QMap<QString, QVariant>::const_iterator i = dbusProps.constBegin(); i != dbusProps.constEnd(); ++i) {
-        d->m_connectionProxy.SetProperty(i.key(), QDBusVariant(i.value()));
-    }
+    d->m_connectionProxy.SetProperties(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.23
+Version:    1.2.24
 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.31+git20
+Requires:   connman >= 1.32+git104
 Requires:   libdbusaccess >= 1.0.4
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig