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

1 files changed, 11 insertions, 16 deletions

diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp
index 856a326..72b3b16 100644
--- a/lib/Plugins/FileTransfer.cpp
+++ b/lib/Plugins/FileTransfer.cpp
@@ -60,12 +60,11 @@ void CFileTransfer::SendFile(const char *pURL, const char *pFilename)
     int len = strlen(pURL);
     if (len == 0)
     {
-        warn_client(_("FileTransfer: URL not specified"));
+        error_msg(_("FileTransfer: URL not specified"));
         return;
     }
 
-    string msg = ssprintf(_("Sending archive %s to %s"), pFilename, pURL);
-    update_client(msg.c_str());
+    update_client(_("Sending archive %s to %s"), pFilename, pURL);
 
     string wholeURL = concat_path_file(pURL, pFilename);
 
@@ -332,8 +331,7 @@ void CFileTransfer::Run(const char *pActionDir, const char *pArgs)
         }
         catch (CABRTException& e)
         {
-            warn_client(_("CFileTransfer::Run(): Cannot create and send an archive: ") + e.what());
-            //update_client("CFileTransfer::Run(): Cannot create and send an archive: " + e.what());
+            error_msg(_("Can't create and send an archive: %s"), e.what());
         }
         unlink(archivename.c_str());
     }
@@ -358,8 +356,7 @@ void CFileTransfer::Run(const char *pActionDir, const char *pArgs)
             }
             catch (CABRTException& e)
             {
-                warn_client(_("CFileTransfer::Run(): Cannot create and send an archive: ") + e.what());
-//                update_client("CFileTransfer::Run(): Cannot create and send an archive: " + e.what());
+                error_msg(_("Can't create and send an archive %s"), e.what());
             }
             unlink(archivename.c_str());
         }
@@ -381,7 +378,7 @@ void CFileTransfer::SetSettings(const map_plugin_settings_t& pSettings)
     }
     else
     {
-        warn_client(_("FileTransfer: URL not specified"));
+        error_msg(_("FileTransfer: URL not specified"));
     }
 
     it = pSettings.find("RetryCount");
@@ -408,16 +405,14 @@ void CFileTransfer::SetSettings(const map_plugin_settings_t& pSettings)
     }
 }
 
-map_plugin_settings_t CFileTransfer::GetSettings()
+const map_plugin_settings_t& CFileTransfer::GetSettings()
 {
-    map_plugin_settings_t ret;
+    m_pSettings["URL"] = m_sURL;
+    m_pSettings["RetryCount"] = to_string(m_nRetryCount);
+    m_pSettings["RetryDelay"] = to_string(m_nRetryDelay);
+    m_pSettings["ArchiveType"] = m_sArchiveType;
 
-    ret["URL"] = m_sURL;
-    ret["RetryCount"] = to_string(m_nRetryCount);
-    ret["RetryDelay"] = to_string(m_nRetryDelay);
-    ret["ArchiveType"] = m_sArchiveType;
-
-    return ret;
+    return m_pSettings;
 }
 
 PLUGIN_INFO(ACTION,