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

- Changes for Message Toaster

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ruchijain 2010-06-13 10:12:56 +00:00
parent 5b0aa33995
commit 5107fbdd0a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/pqi/p3notify.cc
View File

@ -78,7 +78,7 @@ bool p3Notify::NotifyLogMessage(uint32_t &sysid, uint32_t &type,
} }
bool p3Notify::NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &msg) bool p3Notify::NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &title, std::string &msg)
{ {
RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/ RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/
if (pendingPopupMsgs.size() > 0) if (pendingPopupMsgs.size() > 0)
@ -88,6 +88,7 @@ bool p3Notify::NotifyPopupMessage(uint32_t &ptype, std::string &name, std::strin
ptype = pmsg.type; ptype = pmsg.type;
name = pmsg.name; name = pmsg.name;
title = pmsg.title;
msg = pmsg.msg; msg = pmsg.msg;
return true; return true;
@ -121,7 +122,7 @@ bool p3Notify::SetPopupMessageMode(uint32_t ptype, uint32_t mode)
/* Input from libretroshare */ /* Input from libretroshare */
bool p3Notify::AddPopupMessage(uint32_t ptype, std::string name, std::string msg) bool p3Notify::AddPopupMessage(uint32_t ptype, std::string name, std::string title, std::string msg)
{ {
RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/ RsStackMutex stack(noteMtx); /************* LOCK MUTEX ************/
@ -129,6 +130,7 @@ bool p3Notify::AddPopupMessage(uint32_t ptype, std::string name, std::string msg
pmsg.type = ptype; pmsg.type = ptype;
pmsg.name = name; pmsg.name = name;
pmsg.title = title;
pmsg.msg = msg; pmsg.msg = msg;
pendingPopupMsgs.push_back(pmsg); pendingPopupMsgs.push_back(pmsg);

5
libretroshare/src/pqi/p3notify.h
View File

@ -57,6 +57,7 @@ class p3NotifyPopupMsg
uint32_t type; uint32_t type;
std::string name; std::string name;
std::string title;
std::string msg; std::string msg;
}; };
@ -71,7 +72,7 @@ virtual ~p3Notify() { return; }
/* Output for retroshare-gui */ /* Output for retroshare-gui */
virtual bool NotifySysMessage(uint32_t &sysid, uint32_t &type, virtual bool NotifySysMessage(uint32_t &sysid, uint32_t &type,
std::string &title, std::string &msg); std::string &title, std::string &msg);
virtual bool NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &msg); virtual bool NotifyPopupMessage(uint32_t &ptype, std::string &name, std::string &title, std::string &msg);
virtual bool NotifyLogMessage(uint32_t &sysid, uint32_t &type, std::string &title, std::string &msg); virtual bool NotifyLogMessage(uint32_t &sysid, uint32_t &type, std::string &title, std::string &msg);
/* Control over Messages */ /* Control over Messages */
@ -84,7 +85,7 @@ virtual bool SetPopupMessageMode(uint32_t ptype, uint32_t mode);
virtual bool GetFeedItem(RsFeedItem &item); virtual bool GetFeedItem(RsFeedItem &item);
/* Overloaded from pqiNotify */ /* Overloaded from pqiNotify */
virtual bool AddPopupMessage(uint32_t ptype, std::string name, std::string msg); virtual bool AddPopupMessage(uint32_t ptype, std::string name, std::string title, std::string msg);
virtual bool AddSysMessage(uint32_t sysid, uint32_t type, std::string title, std::string msg); virtual bool AddSysMessage(uint32_t sysid, uint32_t type, std::string title, std::string msg);
virtual bool AddLogMessage(uint32_t sysid, uint32_t type, std::string title, std::string msg); virtual bool AddLogMessage(uint32_t sysid, uint32_t type, std::string title, std::string msg);
virtual bool AddFeedItem(uint32_t type, std::string id1, std::string id2, std::string id3); virtual bool AddFeedItem(uint32_t type, std::string id1, std::string id2, std::string id3);