mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-19 10:39:53 -05:00
Merge branch 'RetroShare:master' into Fix-Chatnotify
This commit is contained in:
commit
e02eedc300
31 changed files with 532 additions and 428 deletions
|
|
@ -163,12 +163,14 @@ static QIcon createAvatar(const QPixmap &avatar, const QPixmap &overlay)
|
|||
|
||||
void RsFriendListModel::setDisplayStatusString(bool b)
|
||||
{
|
||||
preMods();
|
||||
mDisplayStatusString = b;
|
||||
postMods();
|
||||
}
|
||||
|
||||
void RsFriendListModel::setDisplayStatusIcon(bool b)
|
||||
{
|
||||
preMods();
|
||||
mDisplayStatusIcon = b;
|
||||
postMods();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue