From 0af9291e5438acf563b7bee156abd7399b230470 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Thu, 19 Jan 2017 00:32:37 +0100
Subject: [PATCH] Tiny fixes seems groups and messages propagate now

---
 libretroshare/src/rsserver/rsinit.cc          | 3 ++-
 libretroshare/src/serialiser/rsgxsmailitems.h | 5 ++---
 libretroshare/src/serialiser/rsserviceids.h   | 1 +
 libretroshare/src/services/p3gxsmails.h       | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index b57a8e477..c8a514043 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -1493,11 +1493,12 @@ int RsServer::StartupRetroShare()
 	            NULL, rsInitConfig->gxs_passwd );
 	p3GxsMails* mGxsMails = new p3GxsMails(gxsmail_ds, NULL, mGxsIdService);
 	RsGxsNetService* gxsmails_ns = new RsGxsNetService(
-	            RS_SERVICE_TYPE_GXS_MAIL, gxschannels_ds, nxsMgr, mGxsMails,
+	            RS_SERVICE_TYPE_GXS_MAIL, gxsmail_ds, nxsMgr, mGxsMails,
 	            mGxsMails->getServiceInfo(), mReputations, mGxsCircles,
 	            mGxsIdService, pgpAuxUtils);
 	mGxsMails->setNetworkExchangeService(gxsmails_ns);
 	pqih->addService(gxsmails_ns, true);
+	mConfigMgr->addConfiguration("gxs_mail.cfg", gxsmails_ns);
 #	endif // RS_GXS_MAIL
 
 	// remove pword from memory
diff --git a/libretroshare/src/serialiser/rsgxsmailitems.h b/libretroshare/src/serialiser/rsgxsmailitems.h
index 7508164e6..2be002020 100644
--- a/libretroshare/src/serialiser/rsgxsmailitems.h
+++ b/libretroshare/src/serialiser/rsgxsmailitems.h
@@ -23,9 +23,8 @@
 #include "serialiser/rsbaseserial.h"
 #include "serialiser/rstlvidset.h"
 #include "retroshare/rsgxsflags.h"
+#include "retroshare/rsgxscircles.h" // For: GXS_CIRCLE_TYPE_PUBLIC
 
-// TODO: move to rsserviceids.h
-const uint16_t RS_SERVICE_TYPE_GXS_MAIL = 0x0230;
 
 enum GxsMailSubtypes
 {
@@ -132,6 +131,7 @@ struct RsGxsMailGroupItem : RsGxsGrpItem
 	{
 		meta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC;
 		meta.mGroupName = "Mail";
+		meta.mCircleType = GXS_CIRCLE_TYPE_PUBLIC;
 	}
 
 	void clear() {}
@@ -177,7 +177,6 @@ struct RsGxsMailSerializer : RsSerialType
 		default: return 0;
 		}
 
-		std::cout << "RsGxsMailSerializer::size() " << item->PacketSubType() << " return " << s << std::endl;
 		return s;
 	}
 
diff --git a/libretroshare/src/serialiser/rsserviceids.h b/libretroshare/src/serialiser/rsserviceids.h
index 475d92595..1307ec53a 100644
--- a/libretroshare/src/serialiser/rsserviceids.h
+++ b/libretroshare/src/serialiser/rsserviceids.h
@@ -82,6 +82,7 @@ const uint16_t RS_SERVICE_GXS_TYPE_GXSCIRCLE   = 0x0218;
 // not gxs, but used with identities.
 const uint16_t RS_SERVICE_GXS_TYPE_REPUTATION  = 0x0219;
 const uint16_t RS_SERVICE_TYPE_GXS_RECOGN      = 0x0220;
+const uint16_t RS_SERVICE_TYPE_GXS_MAIL        = 0x0230;
 
 // Experimental Services.
 /* DSDV Testing at the moment - Service Only */
diff --git a/libretroshare/src/services/p3gxsmails.h b/libretroshare/src/services/p3gxsmails.h
index 991b00b3a..0a87d1575 100644
--- a/libretroshare/src/services/p3gxsmails.h
+++ b/libretroshare/src/services/p3gxsmails.h
@@ -81,7 +81,7 @@ private:
 	 */
 	bool inline supersedePreferredGroup(const RsGxsGroupId& potentialGrId)
 	{
-		std::cout << "supersedePreferredGroup(const RsGxsGroupId& potentialGrId) " << preferredGroupId << " <? " << potentialGrId << std::endl;
+		//std::cout << "supersedePreferredGroup(const RsGxsGroupId& potentialGrId) " << preferredGroupId << " <? " << potentialGrId << std::endl;
 		if(preferredGroupId < potentialGrId)
 		{
 			preferredGroupId = potentialGrId;