← Back to branch summary

~ci-train-bot/indicator-network/indicator-network-ubuntu-xenial-landing-067

« back to all changes in this revision

Viewing changes to src/indicator/nmofono/vpn/vpn-connection.cpp

  • Committer: CI Train Bot
  • Author(s): Pete Woods
  • Date: 2016-03-04 11:13:59 UTC
  • mfrom: (569.1.4 trunk)
  • Revision ID: ci-train-bot@canonical.com-20160304111359-oqwz2ohklq7xsc6i
Use a shared pending settings instance so we don't overwrite rapid incoming changes Fixes: #1546559

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/indicator/nmofono/vpn/vpn-connection.cpp
197
197
Q_SIGNALS:
198
198
    void updateData(const QStringMap& data);
199
199
    void updateSecrets(const QStringMap& secrets);
 
200
    void settingsDispatched();
200
201
 
201
202
public Q_SLOTS:
202
203
    void dispatchPendingSettings()
209
210
        }
210
211
 
211
212
        m_dirty = false;
 
213
 
 
214
        Q_EMIT settingsDispatched();
212
215
    }
213
216
 
214
217
    void updateVpnData(const QStringMap &vpnData)
400
403
            d->m_openvpnConnection->updateData(d->m_settings["vpn"]["data"].value<QStringMap>());
401
404
            connect(d.get(), &Priv::updateData, d->m_openvpnConnection.get(), &OpenvpnConnection::updateData);
402
405
            connect(d.get(), &Priv::updateSecrets, d->m_openvpnConnection.get(), &OpenvpnConnection::updateSecrets);
 
406
            connect(d.get(), &Priv::settingsDispatched, d->m_openvpnConnection.get(), &OpenvpnConnection::markClean);
403
407
            connect(d->m_openvpnConnection.get(), &OpenvpnConnection::updateVpnData, d.get(), &Priv::updateVpnData);
404
408
            connect(d->m_openvpnConnection.get(), &OpenvpnConnection::updateVpnSecrets, d.get(), &Priv::updateVpnSecrets);
405
409
            break;
408
412
            d->m_pptpConnection->updateData(d->m_settings["vpn"]["data"].value<QStringMap>());
409
413
            connect(d.get(), &Priv::updateData, d->m_pptpConnection.get(), &PptpConnection::updateData);
410
414
            connect(d.get(), &Priv::updateSecrets, d->m_pptpConnection.get(), &PptpConnection::updateSecrets);
 
415
            connect(d.get(), &Priv::settingsDispatched, d->m_pptpConnection.get(), &PptpConnection::markClean);
411
416
            connect(d->m_pptpConnection.get(), &PptpConnection::updateVpnData, d.get(), &Priv::updateVpnData);
412
417
            connect(d->m_pptpConnection.get(), &PptpConnection::updateVpnSecrets, d.get(), &Priv::updateVpnSecrets);
413
418
            break;