diff options
| author | Karel Klic <kklic@redhat.com> | 2009-11-12 16:58:07 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2009-11-12 16:58:07 +0100 |
| commit | 32cee84a34c005fe0d2863f439007ec633687fa8 (patch) | |
| tree | 149ca7014e4295de3788f28ae88e9d9d7003da46 /lib/Plugins/Mailx.cpp | |
| parent | 5a8a8a6c99c9067e0dfcce839c32826a2badff0b (diff) | |
| parent | 3938e6e075867ae3a349ba307ee672aa458d2662 (diff) | |
| download | abrt-32cee84a34c005fe0d2863f439007ec633687fa8.tar.gz abrt-32cee84a34c005fe0d2863f439007ec633687fa8.tar.xz abrt-32cee84a34c005fe0d2863f439007ec633687fa8.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'lib/Plugins/Mailx.cpp')
| -rw-r--r-- | lib/Plugins/Mailx.cpp | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index f083404..1979f9e 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -201,33 +201,42 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, void CMailx::SetSettings(const map_plugin_settings_t& pSettings) { - if (pSettings.find("Subject") != pSettings.end()) + m_pSettings = pSettings; + + map_plugin_settings_t::const_iterator end = pSettings.end(); + map_plugin_settings_t::const_iterator it; + it = pSettings.find("Subject"); + if (it != end) { - m_sSubject = pSettings.find("Subject")->second; + m_sSubject = it->second; } - if (pSettings.find("EmailFrom") != pSettings.end()) + it = pSettings.find("EmailFrom"); + if (it != end) { - m_sEmailFrom = pSettings.find("EmailFrom")->second; + m_sEmailFrom = it->second; } - if (pSettings.find("EmailTo") != pSettings.end()) + it = pSettings.find("EmailTo"); + if (it != end) { - m_sEmailTo = pSettings.find("EmailTo")->second; + m_sEmailTo = it->second; } - if (pSettings.find("SendBinaryData") != pSettings.end()) + it = pSettings.find("SendBinaryData"); + if (it != end) { - m_bSendBinaryData = pSettings.find("SendBinaryData")->second == "yes"; + m_bSendBinaryData = string_to_bool(it->second.c_str()); } } -const map_plugin_settings_t& CMailx::GetSettings() -{ - m_pSettings["Subject"] = m_sSubject; - m_pSettings["EmailFrom"] = m_sEmailFrom; - m_pSettings["EmailTo"] = m_sEmailTo; - m_pSettings["SendBinaryData"] = m_bSendBinaryData ? "yes" : "no"; - - return m_pSettings; -} +//ok to delete? +//const map_plugin_settings_t& CMailx::GetSettings() +//{ +// m_pSettings["Subject"] = m_sSubject; +// m_pSettings["EmailFrom"] = m_sEmailFrom; +// m_pSettings["EmailTo"] = m_sEmailTo; +// m_pSettings["SendBinaryData"] = m_bSendBinaryData ? "yes" : "no"; +// +// return m_pSettings; +//} PLUGIN_INFO(REPORTER, CMailx, |