projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't say 'certificate downloaded' if it failed during the read part.
[dcpomatic.git]
/
src
/
wx
/
email_dialog.cc
diff --git
a/src/wx/email_dialog.cc
b/src/wx/email_dialog.cc
index fa9e319f607d31306be5c47c684000868a670f73..b95d79b03ba83174c72e091eb21635d9b83ff28b 100644
(file)
--- a/
src/wx/email_dialog.cc
+++ b/
src/wx/email_dialog.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,6
+23,7
@@
using std::string;
using boost::shared_ptr;
using std::string;
using boost::shared_ptr;
+using boost::optional;
EmailDialog::EmailDialog (wxWindow* parent)
: TableDialog (parent, _("Email address"), 2, 1, true)
EmailDialog::EmailDialog (wxWindow* parent)
: TableDialog (parent, _("Email address"), 2, 1, true)
@@
-38,8
+40,14
@@
EmailDialog::set (string address)
_email->SetValue (std_to_wx (address));
}
_email->SetValue (std_to_wx (address));
}
-string
+optional<string>
EmailDialog::get () const
{
EmailDialog::get () const
{
- return wx_to_std (_email->GetValue ());
+ string s = wx_to_std (_email->GetValue ());
+ if (s.empty ()) {
+ /* Invalid email address */
+ return optional<string> ();
+ }
+
+ return s;
}
}