From 0586639caf9fd8218257a16006bb9783ee490102 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Sun, 1 Nov 2009 23:25:19 +0100 Subject: Hack to fix the problem with daemon remembering the last used settings --- lib/Plugins/Mailx.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/Plugins/Mailx.cpp') diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index f7a86fd..ef3a8d2 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -118,7 +118,8 @@ void CMailx::SendEmail(const std::string& pSubject, const std::string& pText, co ExecMailx(atoi(pUID.c_str()), pText); } -std::string CMailx::Report(const map_crash_report_t& pCrashReport, const std::string& pArgs) +std::string CMailx::Report(const map_crash_report_t& pCrashReport, + const map_plugin_settings_t& pSettings, const std::string& pArgs) { update_client(_("Creating a report...")); -- cgit From 57039b590e4411606795893c90f9871e0412ca31 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 6 Nov 2009 18:26:42 +0100 Subject: give Plugin class a map_plugin_settings_t member This simplifies and unifies get/set settings ops Signed-off-by: Denys Vlasenko --- lib/Plugins/Mailx.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/Plugins/Mailx.cpp') diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index ef3a8d2..f083404 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -219,16 +219,14 @@ void CMailx::SetSettings(const map_plugin_settings_t& pSettings) } } -map_plugin_settings_t CMailx::GetSettings() +const map_plugin_settings_t& CMailx::GetSettings() { - map_plugin_settings_t ret; + m_pSettings["Subject"] = m_sSubject; + m_pSettings["EmailFrom"] = m_sEmailFrom; + m_pSettings["EmailTo"] = m_sEmailTo; + m_pSettings["SendBinaryData"] = m_bSendBinaryData ? "yes" : "no"; - ret["Subject"] = m_sSubject; - ret["EmailFrom"] = m_sEmailFrom; - ret["EmailTo"] = m_sEmailTo; - ret["SendBinaryData"] = m_bSendBinaryData ? "yes" : "no"; - - return ret; + return m_pSettings; } PLUGIN_INFO(REPORTER, -- cgit