Fixed up the retroshare message system.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@331 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/rsserver/p3face.h

@@ -36,12 +36,9 @@
 #include "rsiface/rstypes.h"
 #include "util/rsthreads.h"
 
-class p3disc;
-class p3MsgService;
-class p3ChatService;
-
-#include "services/p3chatservice.h"
+#include "services/p3disc.h"
 #include "services/p3msgservice.h"
+#include "services/p3chatservice.h"
 
 /* The Main Interface Class - for controlling the server */
 
@@ -159,18 +156,10 @@ int     UpdateRemotePeople();
 	/* p3face-msg Operations */
 
 	public:
-	/* Message Items */
-virtual int MessageSend(MessageInfo &info);
-virtual int MessageDelete(std::string mid);
-virtual int MessageRead(std::string mid);
-
 	/* Channel Items */
 virtual int ChannelCreateNew(ChannelInfo &info);
 virtual int ChannelSendMsg(ChannelInfo &info);
 
-	/* Chat */
-virtual int 	ChatSend(ChatInfo &ci);
-
 /* Flagging Persons / Channels / Files in or out of a set (CheckLists) */
 virtual int     SetInChat(std::string id, bool in);         /* friend : chat msgs */
 virtual int     SetInMsg(std::string id, bool in);          /* friend : msg receipients */ 
@@ -183,16 +172,17 @@ virtual int     ClearInBroadcast();
 virtual int     ClearInSubscribe();
 virtual int     ClearInRecommend();
 
+virtual bool    IsInChat(std::string id);           /* friend : chat msgs */
+virtual bool    IsInMsg(std::string id);            /* friend : msg recpts*/
+
 
 	private:
 
+ 	std::list<std::string> mInChatList, mInMsgList;
+	         
 	/* Internal Update Iface Fns */
-int 	UpdateAllChat();
-int 	UpdateAllMsgs();
 int 	UpdateAllChannels();
 
-void initRsChatInfo(RsChatItem *c, ChatInfo &i);
-
 
 #ifdef PQI_USE_CHANNELS
 	/* Internal Helper Fns */