diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-30 11:02:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-30 11:02:16 +0100 |
| commit | 54f93021620b7d26120c32b5f45a0d046d3612de (patch) | |
| tree | f57a1a1ff907c59a6c960836af5e73701cf5e6e8 /src/wx | |
| parent | 8c1098fa6c261d3ef4c5c74103b6fa2731459d6c (diff) | |
Rename Config::_signer to Config::_signer_chain.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/config_dialog.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index da3d85bef..da6a94bbe 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -682,7 +682,7 @@ private: void config_changed () { - _signer.reset (new dcp::CertificateChain (*Config::instance()->signer().get ())); + _signer.reset (new dcp::CertificateChain (*Config::instance()->signer_chain().get ())); update_certificate_list (); update_signer_private_key (); @@ -699,7 +699,7 @@ private: try { dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ()))); _signer->add (c); - Config::instance()->set_signer (_signer); + Config::instance()->set_signer_chain (_signer); update_certificate_list (); } catch (dcp::MiscError& e) { error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ())); @@ -720,7 +720,7 @@ private: _certificates->DeleteItem (i); _signer->remove (i); - Config::instance()->set_signer (_signer); + Config::instance()->set_signer_chain (_signer); update_sensitivity (); } @@ -750,7 +750,7 @@ private: void remake_certificates () { - shared_ptr<const dcp::CertificateChain> chain = Config::instance()->signer(); + shared_ptr<const dcp::CertificateChain> chain = Config::instance()->signer_chain (); string intermediate_common_name; if (chain->root_to_leaf().size() >= 3) { @@ -781,7 +781,7 @@ private: ) ); - Config::instance()->set_signer (_signer); + Config::instance()->set_signer_chain (_signer); update_certificate_list (); update_signer_private_key (); } @@ -812,7 +812,7 @@ private: } _signer->set_key (dcp::file_to_string (p)); - Config::instance()->set_signer (_signer); + Config::instance()->set_signer_chain (_signer); update_signer_private_key (); } catch (dcp::MiscError& e) { error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ())); |