diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index b93682384..8132e16e4 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -239,25 +239,22 @@ void FriendsDialog::processSettings(bool bLoad) void FriendsDialog::chatMessageReceived(const ChatMessage &msg) { - if(!msg.chat_id.isBroadcast()) - return; + if(!msg.chat_id.isBroadcast()) + return; - if(ui.chatWidget->isActive()) - { - QDateTime sendTime = DateTime::DateTimeFromTime_t(msg.sendTime); - QDateTime recvTime = DateTime::DateTimeFromTime_t(msg.recvTime); - QString message = QString::fromUtf8(msg.msg.c_str()); - QString name = QString::fromUtf8(rsPeers->getPeerName(msg.broadcast_peer_id).c_str()); + QDateTime sendTime = DateTime::DateTimeFromTime_t(msg.sendTime); + QDateTime recvTime = DateTime::DateTimeFromTime_t(msg.recvTime); + QString message = QString::fromUtf8(msg.msg.c_str()); + QString name = QString::fromUtf8(rsPeers->getPeerName(msg.broadcast_peer_id).c_str()); - ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL); + ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL); - if(ui.chatWidget->isActive()) - { - // clear the chat notify when control returns to the Qt event loop - // we have to do this later, because we don't know if we or the notify receives the chat message first - QMetaObject::invokeMethod(this, "clearChatNotify", Qt::QueuedConnection); - } - } + if(ui.chatWidget->isActive()) + { + // clear the chat notify when control returns to the Qt event loop + // we have to do this later, because we don't know if we or the notify receives the chat message first + QMetaObject::invokeMethod(this, "clearChatNotify", Qt::QueuedConnection); + } } void FriendsDialog::chatStatusReceived(const ChatId &chat_id, const QString &status_string) diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 9ade10fea..1b67c92a9 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -240,6 +240,7 @@ void NewsFeed::handlePostedEvent(std::shared_ptr event) switch(pe->mPostedEventCode) { + case RsPostedEventCode::UPDATED_POSTED_GROUP: case RsPostedEventCode::NEW_POSTED_GROUP: addFeedItem( new PostedGroupItem(this, NEWSFEED_POSTEDNEWLIST, pe->mPostedGroupId, false, true)); break; diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp index 9f306685d..6d03cbf56 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp @@ -23,7 +23,7 @@ #include "SecurityIpItem.h" #include "FeedHolder.h" -#include"ui_SecurityIpItem.h" +#include "ui_SecurityIpItem.h" #include "retroshare-gui/RsAutoUpdatePage.h" #include "gui/connect/ConfCertDialog.h" #include "util/DateTime.h"