Properly remove JSON server; remove some unused usings; remove some unnecessary uses...

[dcpomatic.git] / src / wx / dolby_certificate_dialog.cc

diff --git a/src/wx/dolby_certificate_dialog.cc b/src/wx/dolby_certificate_dialog.cc
index 9960c16c917a860d88ec49565055393fdd6fc485..a05a3bbc79ff58b73caecc48a70e1afb67bc0038 100644 (file)
--- a/src/wx/dolby_certificate_dialog.cc
+++ b/src/wx/dolby_certificate_dialog.cc
@@ -27,7 +27,6 @@
 using std::list;
 using std::string;
 using std::vector;
-using std::stringstream;
 using std::cout;
 using boost::optional;
 using boost::algorithm::split;
@@ -135,7 +134,7 @@ DolbyCertificateDialog::download ()
        string const zip = string_client_data (_serial->GetClientObject (_serial->GetSelection ()));
 
        string const file = String::compose (
-               "%1/%2/%3",
+               "ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1/%2/%3",
                wx_to_std (_country->GetStringSelection()),
                wx_to_std (_cinema->GetStringSelection()),
                zip
@@ -149,11 +148,11 @@ DolbyCertificateDialog::download ()
                return;
        }
        string const cert = b[0] + "_" + b[1] + ".pem.crt";
-       
+
        optional<string> error = get_from_zip_url (file, cert, _load);
        if (error) {
-               error_dialog (this, std_to_wx (error.get ()));
+               _message->SetLabel (std_to_wx (error.get ()));
+       } else {
+               _message->SetLabel (_("Certificate downloaded"));
        }
-
-       _message->SetLabel (wxT (""));
 }