mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 14:16:16 -04:00
clean up blogs from project file added to the unfinished section for compiling
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e7a78af546
commit
7cba8b3b6b
3 changed files with 40 additions and 28 deletions
|
@ -147,7 +147,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
|
|||
updateAvatar();
|
||||
loadmystatusmessage();
|
||||
|
||||
loadstatus();
|
||||
//loadstatus();
|
||||
|
||||
displayMenu();
|
||||
updateMessengerDisplay();
|
||||
|
@ -930,6 +930,9 @@ void MessengerWindow::displayMenu()
|
|||
/** Load own status Online,Away,Busy **/
|
||||
void MessengerWindow::loadstatus()
|
||||
{
|
||||
//rsiface->lockData(); /* Lock Interface */
|
||||
|
||||
|
||||
/* load up configuration from rsPeers */
|
||||
RsPeerDetails detail;
|
||||
std::string ownId = rsPeers->getOwnId();
|
||||
|
@ -938,7 +941,7 @@ void MessengerWindow::loadstatus()
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
StatusInfo si;
|
||||
if (!rsStatus->getStatus(ownId, si))
|
||||
{
|
||||
|
@ -965,19 +968,23 @@ void MessengerWindow::loadstatus()
|
|||
}
|
||||
|
||||
ui.statuscomboBox->setCurrentIndex(statusIndex);
|
||||
|
||||
//rsiface->unlockData(); /* UnLock Interface */
|
||||
}
|
||||
|
||||
/** Save own status Online,Away,Busy **/
|
||||
void MessengerWindow::savestatus()
|
||||
{
|
||||
//rsiface->lockData(); /* Lock Interface */
|
||||
|
||||
RsPeerDetails detail;
|
||||
std::string ownId = rsPeers->getOwnId();
|
||||
|
||||
if (!rsPeers->getPeerDetails(ownId, detail))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
StatusInfo si;
|
||||
|
||||
int statusIndex = ui.statuscomboBox->currentIndex();
|
||||
|
@ -1005,5 +1012,7 @@ void MessengerWindow::savestatus()
|
|||
si.status = status;
|
||||
|
||||
rsStatus->setStatus(si);
|
||||
|
||||
//rsiface->unlockData(); /* UnLock Interface */
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue