Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gxs Mail disabling is not supported ATM

Browse Source 
Fix some compiler warning
Make travis-ci qmake parser happy with {
This commit is contained in:
Gioacchino Mazzurco 2017-02-26 13:06:38 +01:00
parent 3761b14734
commit b4727bde29
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/libretroshare.pro
View File

@ -852,8 +852,7 @@ gxsphotoshare {
serialiser/rsphotoitems.cc \ serialiser/rsphotoitems.cc \
} }
rs_gxs_mail rs_gxs_mail {
{
HEADERS += serialiser/rsgxsmailitems.h services/p3gxsmails.h HEADERS += serialiser/rsgxsmailitems.h services/p3gxsmails.h
SOURCES += serialiser/rsgxsmailitems.cc services/p3gxsmails.cpp SOURCES += serialiser/rsgxsmailitems.cc services/p3gxsmails.cpp
} }

16
libretroshare/src/services/p3msgservice.cc
View File

@ -85,10 +85,11 @@ static const uint32_t RS_MSG_DISTANT_MESSAGE_HASH_KEEP_TIME = 2*30*86400 ; // ke
p3MsgService::p3MsgService( p3ServiceControl *sc, p3IdService *id_serv, p3MsgService::p3MsgService( p3ServiceControl *sc, p3IdService *id_serv,
p3GxsMails& gxsMS ) p3GxsMails& gxsMS )
: p3Service(), p3Config(), mIdService(id_serv), mServiceCtrl(sc), : p3Service(), p3Config(),
mMsgMtx("p3MsgService"), mMsgUniqueId(0), gxsMailService(gxsMS), gxsOngoingMutex("p3MsgService Gxs Outgoing Mutex"), mIdService(id_serv),
gxsOngoingMutex("p3MsgService Gxs Outgoing Mutex"), mServiceCtrl(sc), mMsgMtx("p3MsgService"), mMsgUniqueId(0),
recentlyReceivedMutex("p3MsgService recently received hash mutex") recentlyReceivedMutex("p3MsgService recently received hash mutex"),
gxsMailService(gxsMS)
{ {
/* this serialiser is used for services. It's not the same than the one /* this serialiser is used for services. It's not the same than the one
* returned by setupSerialiser(). We need both!! */ * returned by setupSerialiser(). We need both!! */
@ -2030,8 +2031,13 @@ bool p3MsgService::receiveGxsMail( const RsGxsMailItem& originalMessage,
handleIncomingItem(msg_item); handleIncomingItem(msg_item);
} }
else else
{
std::cerr << "p3MsgService::receiveGxsMail(...) Item could not be " std::cerr << "p3MsgService::receiveGxsMail(...) Item could not be "
<< "deserialised. Format error??" << std::endl; << "deserialised. Format error??" << std::endl;
return false;
}
return true;
} }
bool p3MsgService::notifySendMailStatus( const RsGxsMailItem& originalMessage, bool p3MsgService::notifySendMailStatus( const RsGxsMailItem& originalMessage,
@ -2131,6 +2137,8 @@ bool p3MsgService::notifySendMailStatus( const RsGxsMailItem& originalMessage,
return true; return true;
} }
} }
return true;
} }
void p3MsgService::receiveGRouterData( const RsGxsId &destination_key, void p3MsgService::receiveGRouterData( const RsGxsId &destination_key,

10
retroshare.pri
View File

@ -60,10 +60,10 @@ rs_nodeprecatedwarning:CONFIG -= no_rs_nodeprecatedwarning
CONFIG *= no_rs_nocppwarning CONFIG *= no_rs_nocppwarning
rs_nocppwarning:CONFIG -= no_rs_nocppwarning rs_nocppwarning:CONFIG -= no_rs_nocppwarning
# To enable GXS mail append the following assignation to qmake command line # To disable GXS mail append the following assignation to qmake command line
# "CONFIG+=rs_gxs_mail" # "CONFIG+=no_rs_gxs_mail"
CONFIG *= no_rs_gxs_mail CONFIG *= rs_gxs_mail
rs_gxs_mail:CONFIG -= no_rs_gxs_mail #no_rs_gxs_mail:CONFIG -= rs_gxs_mail ## Disabing not supported ATM
unix { unix {
@ -179,7 +179,7 @@ rs_nodeprecatedwarning {
rs_nocppwarning { rs_nocppwarning {
QMAKE_CXXFLAGS += -Wno-cpp QMAKE_CXXFLAGS += -Wno-cpp
DEFINES *= RS_NO_WARN_CPP DEFINES *= RS_NO_WARN_CPP
warning("QMAKE: You have disable cpp warnings.") warning("QMAKE: You have disable C preprocessor warnings.")
} }
rs_gxs_mail:DEFINES *= RS_GXS_MAIL rs_gxs_mail:DEFINES *= RS_GXS_MAIL