Fix compilation and linkage issues

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / info_methods.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
index a689cd99de2fa8370c7e791ca771aa78ed003dfd..91f910e02e21a21145c4ef1bb48c482d6c75da44 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/info_methods.cpp
@@ -1,9 +1,9 @@
 #include <sys/utsname.h>
 
 #include <sys/utsname.h>
 

+#include "stg/version.h"
+#include "stg/common.h"

 #include "info_methods.h"
 #include "info_methods.h"

-#include "version.h"

 #include "rpcconfig.h"
 #include "rpcconfig.h"

-#include "common.h"

 
 void METHOD_INFO::execute(xmlrpc_c::paramList const & paramList,
                           xmlrpc_c::value *   const   retvalPtr)
 
 void METHOD_INFO::execute(xmlrpc_c::paramList const & paramList,
                           xmlrpc_c::value *   const   retvalPtr)


@@ -37,9 +37,7 @@ std::vector<xmlrpc_c::value> dirnameVal;
 
 for (int i = 0; i< DIR_NUM; i++)
     {
 
 for (int i = 0; i< DIR_NUM; i++)
     {

-    std::string dn2e;
-    Encode12str(dn2e, dirNames[i]);
-    dirnameVal.push_back(xmlrpc_c::value_string(dn2e));
+    dirnameVal.push_back(xmlrpc_c::value_string(IconvString(dirNames[i], "KOI8-RU", "UTF-8")));

     }
 
 structVal["dir_names"] = xmlrpc_c::value_array(dirnameVal);
     }
 
 structVal["dir_names"] = xmlrpc_c::value_array(dirnameVal);