Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-10 20:08:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

RetroShare stopped responding during signing a key and asking for password.

Browse Source 
The QSingleShotTimer of ConfCertDialog wants to update the gui and stopped in  PeerItem::updateItem.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-04-28 11:25:12 +00:00
parent 3c14705b39
commit e8b428a911
1 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
retroshare-gui/src/gui/feeds/PeerItem.cpp
View File

@ -22,6 +22,7 @@
#include "PeerItem.h" #include "PeerItem.h"
#include "FeedHolder.h" #include "FeedHolder.h"
#include "../RsAutoUpdatePage.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
@ -146,56 +147,58 @@ void PeerItem::updateItem()
std::cerr << "PeerItem::updateItem()"; std::cerr << "PeerItem::updateItem()";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
RsPeerDetails details; if(!RsAutoUpdatePage::eventsLocked()) {
if (!rsPeers->getPeerDetails(mPeerId, details)) RsPeerDetails details;
{ if (!rsPeers->getPeerDetails(mPeerId, details))
return; {
} return;
}
/* top Level info */ /* top Level info */
QString status = QString::fromStdString(RsPeerStateString(details.state)); QString status = QString::fromStdString(RsPeerStateString(details.state));
#if 0 #if 0
/* Append additional status info from status service */ /* Append additional status info from status service */
StatusInfo statusInfo; StatusInfo statusInfo;
if ((rsStatus) && (rsStatus->getStatus(*it, statusInfo))) if ((rsStatus) && (rsStatus->getStatus(*it, statusInfo)))
{ {
status.append(QString::fromStdString("/" + RsStatusString(statusInfo.status))); status.append(QString::fromStdString("/" + RsStatusString(statusInfo.status)));
} }
#endif #endif
statusLabel->setText(status); statusLabel->setText(status);
trustLabel->setText(QString::fromStdString( trustLabel->setText(QString::fromStdString(
RsPeerTrustString(details.trustLvl))); RsPeerTrustString(details.trustLvl)));
{ {
std::ostringstream out; std::ostringstream out;
out << details.localAddr << ":"; out << details.localAddr << ":";
out << details.localPort << "/"; out << details.localPort << "/";
out << details.extAddr << ":"; out << details.extAddr << ":";
out << details.extPort; out << details.extPort;
ipLabel->setText(QString::fromStdString(out.str())); ipLabel->setText(QString::fromStdString(out.str()));
}
connLabel->setText(QString::fromStdString(details.autoconnect));
QDateTime date = QDateTime::fromTime_t(details.lastConnect);
QString stime = date.toString(Qt::LocalDate);
lastLabel-> setText(stime);
/* do buttons */
chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED);
if (details.state & RS_PEER_STATE_FRIEND)
{
addButton->setEnabled(false);
removeButton->setEnabled(true);
msgButton->setEnabled(true);
}
else
{
addButton->setEnabled(true);
removeButton->setEnabled(false);
msgButton->setEnabled(false);
}
} }
connLabel->setText(QString::fromStdString(details.autoconnect));
QDateTime date = QDateTime::fromTime_t(details.lastConnect);
QString stime = date.toString(Qt::LocalDate);
lastLabel-> setText(stime);
/* do buttons */
chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED);
if (details.state & RS_PEER_STATE_FRIEND)
{
addButton->setEnabled(false);
removeButton->setEnabled(true);
msgButton->setEnabled(true);
}
else
{
addButton->setEnabled(true);
removeButton->setEnabled(false);
msgButton->setEnabled(false);
}
/* slow Tick */ /* slow Tick */
int msec_rate = 10129; int msec_rate = 10129;