Differential D23713 Diff 65711 plasma-nm-5.15.5/vpn/strongswan/strongswanwidget.cpp

Changeset View

Standalone View

View Options

plasma-nm-5.15.5/vpn/strongswan/strongswanwidget.cpp

Context not available.
49 49​
50 // Connect for validity check 50​ // Connect for validity check
51 connect(d->ui.leGateway, &QLineEdit::textChanged, this, &StrongswanSettingWidget::slotWidgetChanged); 51​ connect(d->ui.leGateway, &QLineEdit::textChanged, this, &StrongswanSettingWidget::slotWidgetChanged);
52​ connect(d->ui.proposal, &QGroupBox::toggled, this, &SettingWidget::settingChanged);
52 53​
53 KAcceleratorManager::manage(this); 54​ KAcceleratorManager::manage(this);
54 55​
Context not available.
97 d->ui.innerIP->setChecked(dataMap[NM_STRONGSWAN_INNERIP] == "yes"); 98​ d->ui.innerIP->setChecked(dataMap[NM_STRONGSWAN_INNERIP] == "yes");
98 d->ui.udpEncap->setChecked(dataMap[NM_STRONGSWAN_ENCAP] == "yes"); 99​ d->ui.udpEncap->setChecked(dataMap[NM_STRONGSWAN_ENCAP] == "yes");
99 d->ui.ipComp->setChecked(dataMap[NM_STRONGSWAN_IPCOMP] == "yes"); 100​ d->ui.ipComp->setChecked(dataMap[NM_STRONGSWAN_IPCOMP] == "yes");
jgrulichUnsubmitted
Done

Same here, probably pointless to set "IKE" and "ESP" when "Enable custom proposals" is false.

jgrulich: Same here, probably pointless to set "IKE" and "ESP" when "Enable custom proposals" is false.
101​ d->ui.proposal->setChecked(dataMap[NM_STRONGSWAN_PROPOSAL] == "yes");
102​ d->ui.ike->setText(dataMap[NM_STRONGSWAN_IKE]);
103​ d->ui.esp->setText(dataMap[NM_STRONGSWAN_ESP]);
100} 104​}
101 105​
102void StrongswanSettingWidget::loadSecrets(const NetworkManager::Setting::Ptr &setting) 106​void StrongswanSettingWidget::loadSecrets(const NetworkManager::Setting::Ptr &setting)
Context not available.
148 data.insert(NM_STRONGSWAN_INNERIP, d->ui.innerIP->isChecked() ? "yes" : "no"); 152​ data.insert(NM_STRONGSWAN_INNERIP, d->ui.innerIP->isChecked() ? "yes" : "no");
149 data.insert(NM_STRONGSWAN_ENCAP, d->ui.udpEncap->isChecked() ? "yes" : "no"); 153​ data.insert(NM_STRONGSWAN_ENCAP, d->ui.udpEncap->isChecked() ? "yes" : "no");
150 data.insert(NM_STRONGSWAN_IPCOMP, d->ui.ipComp->isChecked() ? "yes" : "no"); 154​ data.insert(NM_STRONGSWAN_IPCOMP, d->ui.ipComp->isChecked() ? "yes" : "no");
155​ if (d->ui.proposal->isChecked()) {
156​ data.insert(NM_STRONGSWAN_PROPOSAL, "yes");
pinoUnsubmitted
Done

should these be set only when the custom proposals are accepted?

pino: should these be set only when the custom proposals are accepted?
jgrulichUnsubmitted
Done

Indeed, they should be set only when the "Enable custom proposals" checkbox is checked.

jgrulich: Indeed, they should be set only when the "Enable custom proposals" checkbox is checked.
157​ data.insert(NM_STRONGSWAN_IKE, d->ui.ike->text());
158​ data.insert(NM_STRONGSWAN_ESP, d->ui.esp->text());
159​ } else
160​ data.insert(NM_STRONGSWAN_PROPOSAL, "no");
151 161​
152 // save it all 162​ // save it all
153 setting.setData(data); 163​ setting.setData(data);
Context not available.