summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-02 00:05:47 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-02 00:05:47 +0000
commit8d2a5dd5ef087248578da59b3b47e09787b6c9b7 (patch)
treec5474646a7c3c58183c6424cd79d7dcee0d09399
parentc264984ff9aed2b67f53c368adba82a41ed8c567 (diff)
Remove insistence on 6-figure Doremi serials (fixes #768).
-rw-r--r--ChangeLog4
-rw-r--r--src/wx/doremi_certificate_panel.cc8
2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 285f39359..141883396 100644
--- 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 aaebb7390..4d98b09ea 100644
--- 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