Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some utf8 issues in identities.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6538 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-07-24 14:33:47 +00:00
parent 7330ab894c
commit a823cc9edc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -416,7 +416,7 @@ void IdDialog::insertIdDetails(uint32_t token)
/* get GPG Details from rsPeers */ /* get GPG Details from rsPeers */
std::string ownPgpId = rsPeers->getGPGOwnId(); std::string ownPgpId = rsPeers->getGPGOwnId();
ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName)); ui.lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId)); ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId));
ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash)); ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId)); ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId));
@ -425,7 +425,7 @@ void IdDialog::insertIdDetails(uint32_t token)
{ {
RsPeerDetails details; RsPeerDetails details;
rsPeers->getGPGDetails(data.mPgpId, details); rsPeers->getGPGDetails(data.mPgpId, details);
ui.lineEdit_GpgName->setText(QString::fromStdString(details.name)); ui.lineEdit_GpgName->setText(QString::fromUtf8(details.name.c_str()));
} }
else else
{ {

10
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -117,7 +117,7 @@ void IdEditDialog::updateIdType(bool pseudo)
ui.lineEdit_GpgId->setText(QString::fromStdString(gpgid)); ui.lineEdit_GpgId->setText(QString::fromStdString(gpgid));
ui.lineEdit_GpgHash->setText(tr("To be generated")); ui.lineEdit_GpgHash->setText(tr("To be generated"));
ui.lineEdit_GpgName->setText(QString::fromStdString(details.name)); ui.lineEdit_GpgName->setText(QString::fromUtf8(details.name.c_str()));
} }
} }
@ -183,7 +183,7 @@ void IdEditDialog::loadExistingId(uint32_t token)
// force - incase it wasn't triggered. // force - incase it wasn't triggered.
idTypeToggled(true); idTypeToggled(true);
ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName)); ui.lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId)); ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId));
if (realid) if (realid)
@ -194,7 +194,7 @@ void IdEditDialog::loadExistingId(uint32_t token)
{ {
RsPeerDetails details; RsPeerDetails details;
rsPeers->getGPGDetails(data.mPgpId, details); rsPeers->getGPGDetails(data.mPgpId, details);
ui.lineEdit_GpgName->setText(QString::fromStdString(details.name)); ui.lineEdit_GpgName->setText(QString::fromUtf8(details.name.c_str()));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId)); ui.lineEdit_GpgId->setText(QString::fromStdString(data.mPgpId));
} }
@ -217,7 +217,7 @@ void IdEditDialog::updateId()
RsGxsIdGroup rid; RsGxsIdGroup rid;
// Must set, Nickname, KeyId(if existing), mIdType, GpgId. // Must set, Nickname, KeyId(if existing), mIdType, GpgId.
rid.mMeta.mGroupName = ui.lineEdit_Nickname->text().toStdString(); rid.mMeta.mGroupName = ui.lineEdit_Nickname->text().toUtf8().constData();
if (rid.mMeta.mGroupName.size() < 2) if (rid.mMeta.mGroupName.size() < 2)
{ {
@ -242,7 +242,7 @@ void IdEditDialog::updateId()
//rid.mGpgId = ui.lineEdit_GpgId->text().toStdString(); //rid.mGpgId = ui.lineEdit_GpgId->text().toStdString();
rid.mPgpIdHash = ui.lineEdit_GpgHash->text().toStdString(); rid.mPgpIdHash = ui.lineEdit_GpgHash->text().toStdString();
//rid.mGpgName = ui.lineEdit_GpgName->text().toStdString(); //rid.mGpgName = ui.lineEdit_GpgName->text().toUtf8().constData();
} }
else else
{ {