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

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/ServicePermissionDialog.cpp
View file

@ -88,7 +88,7 @@ void ServicePermissionDialog::itemAdded(int idType, const QString &id, QTreeWidg
}
RsPeerDetails detail;
if (!rsPeers->getPeerDetails(id.toStdString(), detail)) {
if (!rsPeers->getGPGDetails(RsPgpId(id.toStdString()), detail)) {
return;
}
@ -140,7 +140,7 @@ void ServicePermissionDialog::setPermissions()
}
}
rsPeers->setServicePermissionFlags(ui->servicePermissionList->idFromItem(item), flags);
rsPeers->setServicePermissionFlags(RsPgpId(ui->servicePermissionList->idFromItem(item)), flags);
}
done(Accepted);