Merge master.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index d82f52046..d9f104c7d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -172,6 +172,10 @@ public:
 		return _kdm_from;
 	}
 
+	std::string kdm_cc () const {
+		return _kdm_cc;
+	}
+	
 	std::string kdm_email () const {
 		return _kdm_email;
 	}
@@ -323,11 +327,18 @@ public:
 		changed ();
 	}
 
+	void set_kdm_cc (std::string f) {
+		_kdm_cc = f;
+		changed ();
+	}
+	
 	void set_kdm_email (std::string e) {
 		_kdm_email = e;
 		changed ();
 	}
 
+	void reset_kdm_email ();
+
 	void set_check_for_updates (bool c) {
 		_check_for_updates = c;
 		changed ();
@@ -403,6 +414,7 @@ private:
 	std::string _mail_user;
 	std::string _mail_password;
 	std::string _kdm_from;
+	std::string _kdm_cc;
 	std::string _kdm_email;
 	/** true to check for updates on startup */
 	bool _check_for_updates;