X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.cpp;h=de7a02b47e31d97dab59b8ba47666c811ac3452f;hb=5916720e01ef3473e06e9134507a6099c2466198;hp=788df96da5579249c9f7b48722caf27a5790fdca;hpb=1adc00219ba072da57994764d086beed8ffb7bb4;p=quassel.git diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp index 788df96d..de7a02b4 100644 --- a/src/qtui/settingspages/identitiessettingspage.cpp +++ b/src/qtui/settingspages/identitiessettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -241,7 +241,7 @@ void IdentitiesSettingsPage::clientIdentityUpdated() { if(identity->identityName() != clientIdentity->identityName()) renameIdentity(identity->id(), clientIdentity->identityName()); - identity->update(*clientIdentity); + identity->copyFrom(*clientIdentity); if(identity->id() == currentId) displayIdentity(identity, true); @@ -381,7 +381,7 @@ void IdentitiesSettingsPage::on_addIdentity_clicked() { #endif if(dlg.duplicateId() != 0) { // duplicate - newId->update(*identities[dlg.duplicateId()]); + newId->copyFrom(*identities[dlg.duplicateId()]); newId->setId(id); } newId->setIdentityName(dlg.identityName()); @@ -569,7 +569,7 @@ void IdentitiesSettingsPage::showKeyState(const QSslKey &key) { ui.keyTypeLabel->setText(tr("DSA")); break; default: - ui.keyTypeLabel->setText(tr("No Key Loaded")); + ui.keyTypeLabel->setText(tr("No Key loaded")); } ui.clearOrLoadKeyButton->setText(tr("Clear")); }