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

Don't add a ChatMsgItem as feed on own public chat message.

Browse source 
Moved the handling of the avatar from PeerItem::updateItem and ChatMsgItem::updateItem called with QTimer to connect to the signal peerHasNewAvatar.
Fixed compiler warning.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-08-31 22:42:40 +00:00
parent b01c6bf3d1
commit af4667232b
6 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/NewsFeed.cpp
View file

@ -24,6 +24,7 @@
#include "NewsFeed.h"
#include <retroshare/rsnotify.h>
#include <retroshare/rspeers.h>
#include "feeds/ChanNewItem.h"
#include "feeds/ChanMsgItem.h"
@ -374,6 +375,11 @@ void NewsFeed::addFeedItemChatNew(RsFeedItem &fi)
std::cerr << std::endl;
#endif
if (fi.mId1 == rsPeers->getOwnId()) {
/* chat message from myself */
return;
}
/* make new widget */
ChatMsgItem *cm = new ChatMsgItem(this, NEWSFEED_CHATMSGLIST, fi.mId1, fi.mId2, true);
@ -399,7 +405,6 @@ void NewsFeed::addFeedItemMessage(RsFeedItem &fi)
#endif
}
void NewsFeed::addFeedItemFilesNew(RsFeedItem &fi)
{
#ifdef NEWS_DEBUG
@ -408,9 +413,6 @@ void NewsFeed::addFeedItemFilesNew(RsFeedItem &fi)
#endif
}
/* FeedHolder Functions (for FeedItem functionality) */
void NewsFeed::deleteFeedItem(QWidget *item, uint32_t type)
{