Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha

Browse source
This commit is contained in:
Gioacchino Mazzurco 2017-05-15 15:05:07 +02:00
commit 745462a61b
64 changed files with 2685 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libresapi/src/api/ApiServer.cpp
View file

@ -377,8 +377,8 @@ std::string ApiServer::handleRequest(Request &request)
if(data.isRawData())
return data.getRawData();
if(!resp.mCallbackName.empty())
outstream << resource_api::makeKeyValueReference("callback_name", resp.mCallbackName);
if(!resp.mCallbackName.empty())
outstream << resource_api::makeKeyValueReference("callback_name", resp.mCallbackName);
outstream << resource_api::makeKeyValue("debug_msg", debugString.str());
outstream << resource_api::makeKeyValueReference("returncode", returncode);

2
libresapi/src/api/IdentityHandler.cpp
View file

@ -128,7 +128,7 @@ public:
{}
protected:
virtual void gxsDoWork(Request &req, Response &resp)
virtual void gxsDoWork(Request &req, Response & /* resp */)
{
RsGxsIdGroup group;
std::string gxs_id;

1
libresapi/src/api/RsControlModule.h
View file

@ -1,6 +1,7 @@
#pragma once
#include <util/rsthreads.h>
#include <util/cxx11retrocompat.h>
#include <retroshare/rsnotify.h>
#include "api/ResourceRouter.h"