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

- Switched to new RsAccounts interface.

Browse source 
- Reworked ServerPage to support HiddenNode configuration.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-01-18 02:35:06 +00:00
parent 39db508ce7
commit bbe3ee8d2f
13 changed files with 329 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/StartDialog.cpp
View file

@ -48,17 +48,17 @@ StartDialog::StartDialog(QWidget *parent)
std::list<std::string> accountIds;
std::list<std::string>::iterator it;
std::string preferedId;
RsInit::getPreferedAccountId(preferedId);
RsAccounts::GetPreferredAccountId(preferedId);
int pidx = -1;
int i;
if (RsInit::getAccountIds(accountIds))
if (RsAccounts::GetAccountIds(accountIds))
{
for(it = accountIds.begin(), i = 0; it != accountIds.end(); it++, i++)
{
const QVariant & userData = QVariant(QString::fromStdString(*it));
std::string gpgid, name, email, location;
RsInit::getAccountDetails(*it, gpgid, name, email, location);
RsAccounts::GetAccountDetails(*it, gpgid, name, email, location);
QString accountName = QString::fromUtf8(name.c_str()) + " (" + QString::fromStdString(gpgid).right(8) + ") - " + QString::fromUtf8(location.c_str());
ui.loadName->addItem(accountName, userData);
@ -97,8 +97,6 @@ void StartDialog::loadPerson()
QVariant data = ui.loadName->itemData(pgpidx);
accountId = (data.toString()).toStdString();
RsInit::LoadPassword(accountId, "");
if (Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked())) {
accept();
}