Merge remote-tracking branch 'origin/master' into 2.0

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index f26e2532a..66ff66214 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -168,6 +168,10 @@ public:
 		return _mail_password;
 	}
 
+	std::string kdm_subject () const {
+		return _kdm_subject;
+	}
+
 	std::string kdm_from () const {
 		return _kdm_from;
 	}
@@ -322,6 +326,11 @@ public:
 		changed ();
 	}
 
+	void set_kdm_subject (std::string s) {
+		_kdm_subject = s;
+		changed ();
+	}
+
 	void set_kdm_from (std::string f) {
 		_kdm_from = f;
 		changed ();
@@ -412,6 +421,7 @@ private:
 	std::string _mail_server;
 	std::string _mail_user;
 	std::string _mail_password;
+	std::string _kdm_subject;
 	std::string _kdm_from;
 	std::string _kdm_cc;
 	std::string _kdm_email;