Merge branch 'master' into full-month-stats

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

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
index b64e661599aa3f02c62b418b3ccc406c51d8b9f7..917961484cfe5014356e11fe5af8b272605dd052 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp
@@ -1,11 +1,11 @@
-#include "messages_methods.h"
+#include <ostream> // xmlrpc-c devs have missed something :)

 
 

+#include "stg/message.h"
+#include "stg/common.h"
+#include "messages_methods.h"

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

-#include "stg_message.h"
-#include "utils.h"
-#include "common.h"

 
 

-extern const volatile time_t stgTime;
+extern volatile time_t stgTime;

 
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 


@@ -75,7 +75,7 @@ if ((it = msgInfo.find("text")) == msgInfo.end())
     }
 message.text = IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "CP1251");
 
     }
 message.text = IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "CP1251");
 

-message.header.creationTime = stgTime;
+message.header.creationTime = static_cast<int>(stgTime);

 message.header.lastSendTime = 0;
 
 std::vector<xmlrpc_c::value>::iterator lit;
 message.header.lastSendTime = 0;
 
 std::vector<xmlrpc_c::value>::iterator lit;