X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgdc_certificate_panel.cc;h=ffd7de52f444626d58cc2e6568e7aba6d8220da2;hb=ba66249ab052bb27f49e12a772f366635b08ac2e;hp=b0bb31674458fc7711a7c6bf634660f1ba73dcb9;hpb=6a92ad180163bf84aeedc5f955edc13557e6848c;p=dcpomatic.git

diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index b0bb31674..ffd7de52f 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(),
@@ -51,7 +53,7 @@ GDCCertificatePanel::do_download ()
 		wx_to_std(_serial->GetValue())
 		);
 
-	optional<string> error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
+	optional<string> error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));
 
 	if (error) {
 		_dialog->message()->SetLabel(wxT(""));