Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[vpnmodel] Ask connman to establish VPN connection. JB#42691
As much as possible (preferably everything) should go through connman.
This particular one solves the problem with connman not knowing when
the user cancels the connection (authentication dialog). The result
of the Connect call was being returned to the caller and the caller
was Settings, rather than connman who had no idea what was going on.
  • Loading branch information
monich committed Aug 17, 2018
1 parent 4af8910 commit 6aab197
Showing 1 changed file with 2 additions and 3 deletions.
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 6aab197

Please sign in to comment.