* Added NewsFeed for new Message.

* Disabled newsFeed for failed connection and disconnect.
 * Switched interface file_size to 64 bits for larger files.
 * Flagged distrib groups as changed when subscribe request is processed.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-07-04 14:27:10 +00:00
parent aba2630165
commit 56639fd1ba
5 changed files with 14 additions and 2 deletions

View File

@ -1205,6 +1205,7 @@ bool AuthXPGP::ProcessXPGP(XPGP *xpgp, std::string &id)
mToSaveCerts = true; mToSaveCerts = true;
xpgpMtx.unlock(); /**** UNLOCK ****/ xpgpMtx.unlock(); /**** UNLOCK ****/
#if 0
/******************** notify of new Cert **************************/ /******************** notify of new Cert **************************/
pqiNotify *pqinotify = getPqiNotify(); pqiNotify *pqinotify = getPqiNotify();
if (pqinotify) if (pqinotify)
@ -1212,6 +1213,7 @@ bool AuthXPGP::ProcessXPGP(XPGP *xpgp, std::string &id)
pqinotify->AddFeedItem(RS_FEED_ITEM_PEER_NEW, xpgpid, "",""); pqinotify->AddFeedItem(RS_FEED_ITEM_PEER_NEW, xpgpid, "","");
} }
/******************** notify of new Cert **************************/ /******************** notify of new Cert **************************/
#endif
id = xpgpid; id = xpgpid;

View File

@ -1061,6 +1061,7 @@ void p3ConnectMgr::tickMonitors()
notify->AddFeedItem(RS_FEED_ITEM_PEER_CONNECT, peer.id, "", ""); notify->AddFeedItem(RS_FEED_ITEM_PEER_CONNECT, peer.id, "", "");
} }
} }
#if 0
if (peer.actions & RS_PEER_DISCONNECTED) if (peer.actions & RS_PEER_DISCONNECTED)
{ {
pqiNotify *notify = getPqiNotify(); pqiNotify *notify = getPqiNotify();
@ -1071,6 +1072,7 @@ void p3ConnectMgr::tickMonitors()
} }
} }
#endif
} }
} }
/* do the Others as well! */ /* do the Others as well! */

View File

@ -201,7 +201,7 @@ class DirDetails
std::string name; std::string name;
std::string hash; std::string hash;
std::string path; std::string path;
uint32_t count; uint64_t count;
uint32_t age; uint32_t age;
uint32_t rank; uint32_t rank;
@ -215,7 +215,7 @@ class FileDetail
std::string name; std::string name;
std::string hash; std::string hash;
std::string path; std::string path;
uint32_t size; uint64_t size;
uint32_t age; uint32_t age;
uint32_t rank; uint32_t rank;
}; };

View File

@ -1102,6 +1102,8 @@ bool p3GroupDistrib::subscribeToGroup(std::string grpId, bool subscribe)
if (!(git->second.flags & RS_DISTRIB_SUBSCRIBED)) if (!(git->second.flags & RS_DISTRIB_SUBSCRIBED))
{ {
git->second.flags |= RS_DISTRIB_SUBSCRIBED; git->second.flags |= RS_DISTRIB_SUBSCRIBED;
locked_notifyGroupChanged(git->second);
mGroupsRepublish = true; mGroupsRepublish = true;
} }
} }
@ -1110,6 +1112,8 @@ bool p3GroupDistrib::subscribeToGroup(std::string grpId, bool subscribe)
if (git->second.flags & RS_DISTRIB_SUBSCRIBED) if (git->second.flags & RS_DISTRIB_SUBSCRIBED)
{ {
git->second.flags &= (~RS_DISTRIB_SUBSCRIBED); git->second.flags &= (~RS_DISTRIB_SUBSCRIBED);
locked_notifyGroupChanged(git->second);
mGroupsRepublish = true; mGroupsRepublish = true;
} }
} }

View File

@ -149,6 +149,10 @@ int p3MsgService::incomingMsgs()
{ {
notify->AddPopupMessage(RS_POPUP_MSG, mi->PeerId(), notify->AddPopupMessage(RS_POPUP_MSG, mi->PeerId(),
"New Message from: "); "New Message from: ");
std::ostringstream out;
out << mi->msgId;
notify->AddFeedItem(RS_FEED_ITEM_MESSAGE, out.str(), "", "");
} }
} }