diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-01-05 15:25:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-06 10:29:24 +0100 |
| commit | a713e8258acc3f0e960c4e87ba8684902d29a591 (patch) | |
| tree | 4023978fc160f8e75ced0b8be1e13b7dea452aa3 /src/wx/gdc_certificate_panel.cc | |
| parent | c9772ea0129d59e84cc85cd3908e712b5df56970 (diff) | |
Move credentials settings into certificate download dialogue (#1480).
Diffstat (limited to 'src/wx/gdc_certificate_panel.cc')
| -rw-r--r-- | src/wx/gdc_certificate_panel.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc index b0bb31674..a4301087d 100644 --- a/src/wx/gdc_certificate_panel.cc +++ b/src/wx/gdc_certificate_panel.cc @@ -27,9 +27,18 @@ using std::string; using boost::optional; +using boost::bind; GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog) - : DownloadCertificatePanel (dialog) + : CredentialsDownloadCertificatePanel ( + dialog, + bind(&Config::gdc_username, Config::instance()), + bind(&Config::set_gdc_username, Config::instance(), _1), + bind(&Config::unset_gdc_username, Config::instance()), + bind(&Config::gdc_password, Config::instance()), + bind(&Config::set_gdc_password, Config::instance(), _1), + bind(&Config::unset_gdc_password, Config::instance()) + ) { } @@ -37,13 +46,6 @@ GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog) void GDCCertificatePanel::do_download () { - Config* config = Config::instance (); - if (!config->gdc_username() || !config->gdc_password()) { - _dialog->message()->SetLabel(wxT("")); - error_dialog (this, _("No GDC username/password configured. Add your account details to the Accounts page in Preferences.")); - return; - } - string const url = String::compose( "ftp://%1:%2@ftp.gdc-tech.com/SHA256/A%3.crt.pem", Config::instance()->gdc_username().get(), |