Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'vpnmodel' into 'master'
Ask connman to establish VPN connection

See merge request mer-core/nemo-qml-plugin-systemsettings!62
  • Loading branch information
Slava Monich committed Aug 20, 2018
2 parents 928e910 + 6aab197 commit 016a17b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/certificatemodel.cpp
Expand Up @@ -326,7 +326,7 @@ struct X509Certificate
return rv;
}

friend X509List;
friend struct ::X509List;

X509Certificate(X509 *x) : x509(x) {}

Expand Down
5 changes: 2 additions & 3 deletions src/vpnmodel.cpp
Expand Up @@ -535,9 +535,8 @@ void VpnModel::activateConnection(const QString &path)
qCDebug(lcVpnLog) << "About to connect has pending disconnects:" << !pendingDisconnects_.isEmpty() << pendingDisconnects_.keys() << "connecting:" << path;

if (pendingDisconnects_.isEmpty()) {
auto it = connections_.find(path);
if (it != connections_.end()) {
ConnmanVpnConnectionProxy *proxy(*it);
ConnmanServiceProxy* proxy = vpnServices_.value(path);
if (proxy) {
QDBusPendingCall call = proxy->Connect();
qCDebug(lcVpnLog) << "Connect to vpn" << path;

Expand Down

0 comments on commit 016a17b

Please sign in to comment.