Remove insistence on 6-figure Doremi serials (fixes #768).

diff --git a/ChangeLog b/ChangeLog
index 285f3935979b88116bcf187cb6c3c7c4c0b39827..141883396d1a1c69264e0aaffb1a753b35d70116 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-02  Carl Hetherington  <cth@carlh.net>
+
+       * Remove insistence on 6-character Doremi serials (#768).
+
 2015-12-01  c.hetherington  <cth@carlh.net>
 
        * Updated ru_RU translation from Igor Voytovich.

diff --git a/src/wx/doremi_certificate_panel.cc b/src/wx/doremi_certificate_panel.cc
index aaebb7390831ee709bc7f85efeffe74eaeac9aca..4d98b09ea28c872ccbd21d7a5b83026ce4f44ee1 100644 (file)
--- a/src/wx/doremi_certificate_panel.cc
+++ b/src/wx/doremi_certificate_panel.cc
@@ -50,18 +50,12 @@ DoremiCertificatePanel::DoremiCertificatePanel (wxWindow* parent, DownloadCertif
 void
 DoremiCertificatePanel::download (wxStaticText* message)
 {
-       string const serial = wx_to_std (_serial->GetValue ());
-       if (serial.length() != 6) {
-               error_dialog (this, _("Doremi serial numbers must have 6 digits"));
-               return;
-       }
-
        message->SetLabel (_("Downloading certificate"));
 
        /* Hack: without this the SetLabel() above has no visible effect */
        wxMilliSleep (200);
 
-       signal_manager->when_idle (boost::bind (&DoremiCertificatePanel::finish_download, this, serial, message));
+       signal_manager->when_idle (boost::bind (&DoremiCertificatePanel::finish_download, this, wx_to_std (_serial->GetValue ()), message));
 }
 
 void