diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-06 15:37:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-06 15:37:57 +0100 |
| commit | 04eebe07e2f64bd15f6887a10ab51fb92c52901a (patch) | |
| tree | 2004680de019a5871dd1c2bb5858ed9451232537 /src/lib | |
| parent | d8bce8328bd6e069cb9a69e7316100381eac0545 (diff) | |
| parent | 97a1a713078f151d1b68b6f256a5b885e7733a92 (diff) | |
Merge master.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 2 | ||||
| -rw-r--r-- | src/lib/config.h | 10 | ||||
| -rw-r--r-- | src/lib/kdm.cc | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 1fd4792c3..14539044d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -201,6 +201,7 @@ Config::read () _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_bcc = f.optional_string_child ("KDMBCC").get_value_or (""); _kdm_email = f.string_child ("KDMEmail"); _check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false); @@ -341,6 +342,7 @@ Config::write () const 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("KDMBCC")->add_child_text (_kdm_bcc); root->add_child("KDMEmail")->add_child_text (_kdm_email); root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0"); diff --git a/src/lib/config.h b/src/lib/config.h index d8ac75bed..310d3c6f5 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -185,6 +185,10 @@ public: std::string kdm_cc () const { return _kdm_cc; } + + std::string kdm_bcc () const { + return _kdm_bcc; + } std::string kdm_email () const { return _kdm_email; @@ -363,6 +367,11 @@ public: _kdm_cc = f; changed (); } + + void set_kdm_bcc (std::string f) { + _kdm_bcc = f; + changed (); + } void set_kdm_email (std::string e) { _kdm_email = e; @@ -461,6 +470,7 @@ private: std::string _kdm_subject; std::string _kdm_from; std::string _kdm_cc; + std::string _kdm_bcc; std::string _kdm_email; boost::shared_ptr<const dcp::Signer> _signer; dcp::Certificate _decryption_certificate; diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc index 0593881bc..a2ed1be73 100644 --- a/src/lib/kdm.cc +++ b/src/lib/kdm.cc @@ -250,6 +250,9 @@ email_kdms ( if (!Config::instance()->kdm_cc().empty ()) { quickmail_add_cc (mail, Config::instance()->kdm_cc().c_str ()); } + if (!Config::instance()->kdm_bcc().empty ()) { + quickmail_add_bcc (mail, Config::instance()->kdm_bcc().c_str ()); + } string body = Config::instance()->kdm_email().c_str(); boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ()); |