diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-02-19 15:23:00 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2009-02-19 15:23:00 +0100 |
| commit | 2f907417d37d83cefad7950397bd141c0586b1d5 (patch) | |
| tree | 12d58967607cac7f300e7dcaee456fdfe9bd95a1 /lib/Plugins/Mailx.cpp | |
| parent | b472b75f70c7e9144fb29f9d142e9f52f4caab39 (diff) | |
| parent | 0c899d52e5e42caf8c5c394ef6c142c08ac38858 (diff) | |
| download | abrt-2f907417d37d83cefad7950397bd141c0586b1d5.tar.gz abrt-2f907417d37d83cefad7950397bd141c0586b1d5.tar.xz abrt-2f907417d37d83cefad7950397bd141c0586b1d5.zip | |
Merge branch 'master' of git://git.fedorahosted.org/git/crash-catcher
Conflicts:
lib/DBus/Makefile.am
lib/DBus/dbus-crash-catcher.conf
lib/DBus/dbus-crashcatcher.conf
src/Daemon/Makefile.am
src/Daemon/dbus-crashcatcher.conf
Diffstat (limited to 'lib/Plugins/Mailx.cpp')
| -rw-r--r-- | lib/Plugins/Mailx.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index 2b8ef35..13563c5 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -111,13 +111,13 @@ void CMailx::Report(const crash_report_t& pReport) void CMailx::SetSettings(const map_settings_t& pSettings) { - if (pSettings.find("Email_From")!= pSettings.end()) + if (pSettings.find("EmailFrom")!= pSettings.end()) { - m_sEmailFrom = pSettings.find("Email_From")->second; + m_sEmailFrom = pSettings.find("EmailFrom")->second; } - if (pSettings.find("Email_To")!= pSettings.end()) + if (pSettings.find("EmailTo")!= pSettings.end()) { - m_sEmailTo = pSettings.find("Email_To")->second; + m_sEmailTo = pSettings.find("EmailTo")->second; } if (pSettings.find("Parameters")!= pSettings.end()) { |