diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-16 14:30:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-16 14:30:02 +0100 |
| commit | 94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1 (patch) | |
| tree | d915d31c0b13f7201e3bc62a66fec150baa9ddf8 /src/lib/config.cc | |
| parent | 2154e7c39166cfc4b128545d94a5698c7d70daea (diff) | |
| parent | 5d06efadc0cc88c38a3ab3a44ef676f89ae2e43c (diff) | |
Merge remote-tracking branch 'origin/master' into 2.0
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index d4976676d..71431ec0d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -189,6 +189,7 @@ Config::read () _mail_server = f.string_child ("MailServer"); _mail_user = f.optional_string_child("MailUser").get_value_or (""); _mail_password = f.optional_string_child("MailPassword").get_value_or (""); + _kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME")); _kdm_from = f.string_child ("KDMFrom"); _kdm_cc = f.optional_string_child ("KDMCC").get_value_or (""); _kdm_email = f.string_child ("KDMEmail"); @@ -305,6 +306,7 @@ Config::write () const root->add_child("MailServer")->add_child_text (_mail_server); root->add_child("MailUser")->add_child_text (_mail_user); root->add_child("MailPassword")->add_child_text (_mail_password); + root->add_child("KDMSubject")->add_child_text (_kdm_subject); root->add_child("KDMFrom")->add_child_text (_kdm_from); root->add_child("KDMCC")->add_child_text (_kdm_cc); root->add_child("KDMEmail")->add_child_text (_kdm_email); |