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

Fixed utf8 issues (Patch from Asamk #3393353)

Browse source 
SearchDialog: enable search for strings containing utf8 characters, I assume that filenames are always stored as utf8 on all platforms
ConnectFriendWizard: adding friends with gpg key or from file, now sets location name correctly
notifyqt: setting status message in chatwindow works correctly now, when a friend changes his message while the chat window is open

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4635 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-10-11 23:29:38 +00:00
parent e3798dafe9
commit 7e3a342a9a
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,9 +192,9 @@ void NotifyQt::notifyPeerStatusChanged(const std::string& peer_id, uint32_t stat
/* one or more peers has changed the states */
void NotifyQt::notifyPeerStatusChangedSummary()
{
#ifdef NOTIFY_DEBUG
#ifdef NOTIFY_DEBUG
std::cerr << "Notifyqt:: notified that one peer has changed the state" << std::endl;
#endif
#endif
emit peerStatusChangedSummary();
}
@ -206,41 +206,41 @@ void NotifyQt::notifyChannelMsgReadSatusChanged(const std::string& channelId, co
void NotifyQt::notifyOwnStatusMessageChanged()
{
#ifdef NOTIFY_DEBUG
#ifdef NOTIFY_DEBUG
std::cerr << "Notifyqt:: notified that own avatar changed" << std::endl ;
#endif
#endif
emit ownStatusMessageChanged() ;
}
void NotifyQt::notifyPeerHasNewAvatar(std::string peer_id)
{
#ifdef NOTIFY_DEBUG
#ifdef NOTIFY_DEBUG
std::cerr << "notifyQt: notification of new avatar." << std::endl ;
#endif
#endif
emit peerHasNewAvatar(QString::fromStdString(peer_id)) ;
}
void NotifyQt::notifyCustomState(const std::string& peer_id, const std::string& status_string)
{
#ifdef NOTIFY_DEBUG
#ifdef NOTIFY_DEBUG
std::cerr << "notifyQt: Received custom status string notification" << std::endl ;
#endif
emit peerHasNewCustomStateString(QString::fromStdString(peer_id), QString::fromStdString(status_string)) ;
#endif
emit peerHasNewCustomStateString(QString::fromStdString(peer_id), QString::fromUtf8(status_string.c_str())) ;
}
void NotifyQt::notifyChatStatus(const std::string& peer_id,const std::string& status_string,bool is_private)
{
#ifdef NOTIFY_DEBUG
#ifdef NOTIFY_DEBUG
std::cerr << "notifyQt: Received chat status string: " << status_string << std::endl ;
#endif
emit chatStatusChanged(QString::fromStdString(peer_id),QString::fromStdString(status_string),is_private) ;
#endif
emit chatStatusChanged(QString::fromStdString(peer_id),QString::fromUtf8(status_string.c_str()),is_private) ;
}
void NotifyQt::notifyTurtleSearchResult(uint32_t search_id,const std::list<TurtleFileInfo>& files)
{
#ifdef NOTIFY_DEBUG
#ifdef NOTIFY_DEBUG
std::cerr << "in notify search result..." << std::endl ;
#endif
#endif
for(std::list<TurtleFileInfo>::const_iterator it(files.begin());it!=files.end();++it)
{