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

ID cleaning. Saving progress

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-02-13 21:22:38 +00:00
parent 65ccabced7
commit e865b0b7c3
23 changed files with 89 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -764,7 +764,7 @@ void NotifyQt::UpdateGUI()
{
uint32_t sysid;
uint32_t type;
std::string title, id, msg;
std::string title, id, msg;
if (rsNotify->NotifyPopupMessage(type, id, title, msg))
{
@ -811,7 +811,7 @@ void NotifyQt::UpdateGUI()
case RS_POPUP_CHAT:
if (popupflags & RS_POPUP_CHAT)
{
ChatDialog *chatDialog = ChatDialog::getChat(id, 0);
ChatDialog *chatDialog = ChatDialog::getChat(RsPeerId(id), 0);
ChatWidget *chatWidget;
if (chatDialog && (chatWidget = chatDialog->getChatWidget()) && chatWidget->isActive()) {
// do not show when active
@ -838,7 +838,7 @@ void NotifyQt::UpdateGUI()
case RS_POPUP_CHATLOBBY:
if (popupflags & RS_POPUP_CHATLOBBY)
{
ChatDialog *chatDialog = ChatDialog::getChat(id, 0);
ChatDialog *chatDialog = ChatDialog::getChat(RsPeerId(id), 0);
ChatWidget *chatWidget;
if (chatDialog && (chatWidget = chatDialog->getChatWidget()) && chatWidget->isActive()) {
// do not show when active