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

Moved the tag feature in messages from the gui to the libretroshare.

Browse source 
Changed rsmsg interface and item classes so need full recompile.
Created new notifier for tag changes - NOTIFY_LIST_MESSAGE_TAGS.
Changed serialiser tests for message items.

After that all tags are reset to standard and all assigned tags to messages are lost.
Please delete the file msg_locale.cfg in your profile directory.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-08-22 22:12:26 +00:00
parent 340982b996
commit 52183a0c75
18 changed files with 708 additions and 515 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libretroshare/src/serialiser/rsmsgitems.cc
View file

@ -422,8 +422,8 @@ void RsMsgTagType::clear()
void RsMsgTags::clear()
{
msgId.clear();
tagId = 0;
msgId = 0;
tagIds.clear();
}
std::ostream& RsMsgTagType::print(std::ostream &out, uint16_t indent)
@ -698,8 +698,8 @@ uint32_t RsMsgSerialiser::sizeMsgTagItem(RsMsgTags* item)
{
uint32_t s = 8; /* header */
s += GetTlvStringSize(item->msgId);
s += 4; /* tag id */
s += 4; /* msgId */
s += item->tagIds.size() * 4; /* tagIds */
return s;
}
@ -726,8 +726,13 @@ bool RsMsgSerialiser::serialiseMsgTagItem(RsMsgTags *item, void *data, uint32_t*
/* skip the header */
offset += 8;
ok &= SetTlvString(data,tlvsize,&offset, TLV_TYPE_STR_MSGID, item->msgId);
ok &= setRawUInt32(data, tlvsize, &offset, item->tagId);
ok &= setRawUInt32(data,tlvsize,&offset, item->msgId);
std::list<uint32_t>::iterator mit = item->tagIds.begin();
for(;mit != item->tagIds.end(); mit++)
{
ok &= setRawUInt32(data, tlvsize, &offset, *mit);
}
if (offset != tlvsize)
{
@ -773,8 +778,17 @@ RsMsgTags* RsMsgSerialiser::deserialiseMsgTagItem(void* data, uint32_t* pktsize)
/* get mandatory parts first */
ok &= GetTlvString(data,rssize,&offset,TLV_TYPE_STR_MSGID,item->msgId);
ok &= getRawUInt32(data, rssize, &offset, &(item->tagId));
ok &= getRawUInt32(data, rssize, &offset, &item->msgId);
uint32_t tagId;
while (offset != rssize)
{
tagId = 0;
ok &= getRawUInt32(data, rssize, &offset, &tagId);
item->tagIds.push_back(tagId);
}
if (offset != rssize)
{