mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-10 01:55:19 -04:00
Changed the generation of the gpg key and location to utf8.
The existing gpg keys and locations with umlauts are now shown wrong. The changes are not backward compatible. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
7d4b8288ca
commit
8d4a4db027
32 changed files with 103 additions and 118 deletions
|
@ -114,13 +114,6 @@ void GenCertDialog::show()
|
|||
}
|
||||
}
|
||||
|
||||
void GenCertDialog::closeEvent (QCloseEvent * event)
|
||||
{
|
||||
|
||||
|
||||
QDialog::closeEvent(event);
|
||||
}
|
||||
|
||||
void GenCertDialog::closeinfodlg()
|
||||
{
|
||||
close();
|
||||
|
@ -163,11 +156,11 @@ void GenCertDialog::genPerson()
|
|||
{
|
||||
|
||||
/* Check the data from the GUI. */
|
||||
std::string genLoc = ui.location_input->text().toStdString();
|
||||
std::string genLoc = ui.location_input->text().toUtf8().constData();
|
||||
std::string PGPId;
|
||||
|
||||
if (!genNewGPGKey) {
|
||||
if (ui.location_input->text().length() < 3) {
|
||||
if (genLoc.length() < 3) {
|
||||
/* Message Dialog */
|
||||
QMessageBox::warning ( NULL,
|
||||
tr("Generate GPG key Failure"),
|
||||
|
@ -226,7 +219,7 @@ void GenCertDialog::genPerson()
|
|||
QCoreApplication::processEvents();
|
||||
while(QAbstractEventDispatcher::instance()->processEvents(QEventLoop::AllEvents)) ;
|
||||
|
||||
RsInit::GeneratePGPCertificate(ui.name_input->text().toStdString(), ui.email_input->text().toStdString(), ui.password_input->text().toStdString(), PGPId, err_string);
|
||||
RsInit::GeneratePGPCertificate(ui.name_input->text().toUtf8().constData(), ui.email_input->text().toUtf8().constData(), ui.password_input->text().toStdString(), PGPId, err_string);
|
||||
|
||||
setCursor(Qt::ArrowCursor) ;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue