More certificate download fixes.

diff --git a/src/wx/dolby_certificate_dialog.cc b/src/wx/dolby_certificate_dialog.cc
index 9960c16c917a860d88ec49565055393fdd6fc485..e5bb1896207fe396464624e7ca730093b8d217ab 100644 (file)
--- a/src/wx/dolby_certificate_dialog.cc
+++ b/src/wx/dolby_certificate_dialog.cc
@@ -135,7 +135,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 +149,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 (""));
 }

diff --git a/src/wx/doremi_certificate_dialog.cc b/src/wx/doremi_certificate_dialog.cc
index 766318990c1abceca20087b9b42ff111b48fd0a2..b0840a83fa23f9831f7f47734957b3ce95dddcdc 100644 (file)
--- a/src/wx/doremi_certificate_dialog.cc
+++ b/src/wx/doremi_certificate_dialog.cc
@@ -64,7 +64,7 @@ DoremiCertificateDialog::download ()
        if (error) {
                error_dialog (this, std_to_wx (error.get ()));
        } else {
-               _message->SetLabel (wxT ("Certificate downloaded"));
+               _message->SetLabel (_("Certificate downloaded"));
        }
 }
 

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 232afa33c1fee2715dfc4240128d6c82c835dc1e..b702ae0ad8188be5892108c5b8ebef9afee3157e 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -120,6 +120,8 @@ ScreenDialog::download_certificate ()
                d->ShowModal ();
                d->Destroy ();
        }
+
+       setup_sensitivity ();
 }
 
 void