Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

3 files changed, 6 insertions, 4 deletions

diff --git a/lib/Plugins/Bugzilla.conf b/lib/Plugins/Bugzilla.conf
index 4d5bcba..6e98c9d 100644
--- a/lib/Plugins/Bugzilla.conf
+++ b/lib/Plugins/Bugzilla.conf
@@ -2,7 +2,7 @@
 BugzillaURL = https://bugzilla.redhat.com/
 # yes means that ssl certificates will not be checked
 NoSSLVerify = no
-# your login has to exist, if you don have anyone, please create one
+# your login has to exist, if you don have any, please create one
 Login =
 # your password
 Password =
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 52c8c69..ddf7696 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -136,6 +136,10 @@ static void InstallDebugInfos(const std::string& pPackage)
 #endif
     while (fgets(buff, sizeof(buff), pipeout_fp))
     {
+        int last = strlen(buff) - 1;
+        if (last >= 0 && buff[last] == '\n')
+            buff[last] = '\0';
+
         comm_layer_inner_debug(buff);
         comm_layer_inner_status(buff);
 
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp
index 81b0763..44f7f09 100644
--- a/lib/Plugins/Mailx.cpp
+++ b/lib/Plugins/Mailx.cpp
@@ -105,8 +105,6 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, const std::st
         }
     }
 
-
-
     emailBody << "Duplicity check" << std::endl;
     emailBody << "=====" << std::endl << std::endl;
     emailBody << UUIDFile.str() << std::endl;
@@ -133,7 +131,7 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, const std::st
     {
         SendEmail(m_sSubject, emailBody.str());
     }
-    return "Email was send to :" + m_sEmailTo;
+    return "Email was sent to: " + m_sEmailTo;
 }
 
 void CMailx::SetSettings(const map_plugin_settings_t& pSettings)