diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/wx/download_certificate_panel.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/wx/download_certificate_panel.cc')
| -rw-r--r-- | src/wx/download_certificate_panel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc index c30b05008..b4bdd1ce4 100644 --- a/src/wx/download_certificate_panel.cc +++ b/src/wx/download_certificate_panel.cc @@ -22,9 +22,9 @@ #include "download_certificate_dialog.h" #include "download_certificate_panel.h" #include "wx_util.h" -#include "lib/compose.hpp" #include "lib/signal_manager.h" #include <dcp/certificate_chain.h> +#include <dcp/compose.h> #include <dcp/exceptions.h> #include <dcp/util.h> #include <boost/bind/bind.hpp> @@ -63,7 +63,7 @@ DownloadCertificatePanel::load_certificate (boost::filesystem::path file) try { _certificate = dcp::Certificate (dcp::file_to_string(file)); } catch (dcp::MiscError& e) { - return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what()); + return dcp::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what()); } return {}; } @@ -75,7 +75,7 @@ DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path f try { _certificate = dcp::CertificateChain (dcp::file_to_string(file)).leaf(); } catch (dcp::MiscError& e) { - return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what()); + return dcp::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what()); } return {}; } |