mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-17 10:31:05 -04:00
- fixed up avatar exchange between peers
- reverted preceding commit about PNG/JPG in popup chat dialog. This only concerns internal data representation and this string has nothing to do with accepted image formats. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1704 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c255ec1a21
commit
dee82c5f1b
12 changed files with 31 additions and 28 deletions
|
@ -52,6 +52,7 @@ public:
|
|||
~PopupChatDialog();
|
||||
|
||||
void updateChat();
|
||||
void updatePeerAvatar(const std::string&);
|
||||
void addChatMsg(ChatInfo *ci);
|
||||
|
||||
void loadEmoticons();
|
||||
|
@ -106,7 +107,6 @@ private slots:
|
|||
private:
|
||||
|
||||
void colorChanged(const QColor &c);
|
||||
void updatePeerAvatar(const std::string&);
|
||||
void updateAvatar();
|
||||
void addAttachment(std::string);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue