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

1 files changed, 8 insertions, 12 deletions

diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp
index 6bb44a9..13fa8a4 100644
--- a/lib/Plugins/Catcut.cpp
+++ b/lib/Plugins/Catcut.cpp
@@ -162,9 +162,7 @@ static void create_new_bug_description(const map_crash_report_t& pCrashReport, s
         }
         else if (it->second[CD_TYPE] == CD_BIN)
         {
-            string msg = ssprintf(_("Binary file %s will not be reported."), it->first.c_str());
-            warn_client(msg);
-            //update_client(_("Binary file ")+it->first+_(" will not be reported."));
+            error_msg(_("Binary file %s will not be reported"), it->first.c_str());
         }
     }
 }
@@ -244,7 +242,7 @@ static string new_bug(const char *auth_cookie, const map_crash_report_t& pCrashR
     throw_if_xml_fault_occurred();
     bug_id_str = bug_id;
     log("New bug id: %s", bug_id);
-    update_client(_("New bug id: ") + bug_id_str);
+    update_client(_("New bug id: %s"), bug_id);
     free((void*)bug_id);
     xmlrpc_DECREF(bug_id_xml);
 
@@ -350,16 +348,14 @@ void CReporterCatcut::SetSettings(const map_plugin_settings_t& pSettings)
     }
 }
 
-map_plugin_settings_t CReporterCatcut::GetSettings()
+const map_plugin_settings_t& CReporterCatcut::GetSettings()
 {
-    map_plugin_settings_t ret;
+    m_pSettings["CatcutURL"] = m_sCatcutURL;
+    m_pSettings["Login"] = m_sLogin;
+    m_pSettings["Password"] = m_sPassword;
+    m_pSettings["NoSSLVerify"] = m_bNoSSLVerify ? "yes" : "no";
 
-    ret["CatcutURL"] = m_sCatcutURL;
-    ret["Login"] = m_sLogin;
-    ret["Password"] = m_sPassword;
-    ret["NoSSLVerify"] = m_bNoSSLVerify ? "yes" : "no";
-
-    return ret;
+    return m_pSettings;
 }
 
 PLUGIN_INFO(REPORTER,