X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.cpp;h=e51fa7aa446e62a84a7f47d3c8d8c13c140ca6c5;hb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45;hp=83b120661f927e84195f1f1d6af55bb3cb5cc3b9;hpb=9a6a8478bdd8c7c5bb4ff1fa3de9510863d65a97;p=quassel.git

diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp
index 83b12066..e51fa7aa 100644
--- a/src/qtui/settingspages/identitiessettingspage.cpp
+++ b/src/qtui/settingspages/identitiessettingspage.cpp
@@ -18,18 +18,34 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "identitiessettingspage.h"
+
 #include <QInputDialog>
+#include <QFileDialog>
+#include <QDesktopServices>
 #include <QMessageBox>
-
-#include "identitiessettingspage.h"
+#include <QSslKey>
 
 #include "client.h"
+#include "iconloader.h"
+#include "signalproxy.h"
 
 IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
-  : SettingsPage(tr("General"), tr("Identities"), parent) {
+  : SettingsPage(tr("General"), tr("Identities"), parent),
+    _editSsl(false)
+{
 
   ui.setupUi(this);
-  setEnabled(false);  // need a core connection!
+  ui.renameIdentity->setIcon(BarIcon("edit-rename"));
+  ui.addIdentity->setIcon(BarIcon("list-add-user"));
+  ui.deleteIdentity->setIcon(BarIcon("list-remove-user"));
+  ui.addNick->setIcon(SmallIcon("list-add"));
+  ui.deleteNick->setIcon(SmallIcon("edit-delete"));
+  ui.renameNick->setIcon(SmallIcon("edit-rename"));
+  ui.nickUp->setIcon(SmallIcon("go-up"));
+  ui.nickDown->setIcon(SmallIcon("go-down"));
+
+  setEnabled(Client::isConnected());  // need a core connection!
   setWidgetStates();
   connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
   connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientIdentityCreated(IdentityId)));
@@ -45,14 +61,13 @@ IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
   connect(ui.awayNickEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.awayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.awayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-  connect(ui.returnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
-  connect(ui.returnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayTime, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.autoAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-  connect(ui.autoReturnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
-  connect(ui.autoReturnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+  connect(ui.detachAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+  connect(ui.detachAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
+  connect(ui.detachAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
   connect(ui.ident, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.kickReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
   connect(ui.partReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
@@ -60,10 +75,15 @@ IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
 
   connect(ui.nicknameList, SIGNAL(itemSelectionChanged()), this, SLOT(setWidgetStates()));
 
+#ifdef HAVE_SSL
+  ui.keyAndCertSettings->setCurrentIndex(1);
+#else
+  ui.keyAndCertSettings->setCurrentIndex(0);
+#endif
+
   // we would need this if we enabled drag and drop in the nicklist...
   //connect(ui.nicknameList, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(setWidgetStates()));
   //connect(ui.nicknameList->model(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(nicklistHasChanged()));
-
 }
 
 void IdentitiesSettingsPage::setWidgetStates() {
@@ -77,7 +97,6 @@ void IdentitiesSettingsPage::setWidgetStates() {
     ui.nickDown->setDisabled(true);
   }
   ui.deleteNick->setEnabled(ui.nicknameList->count() > 1);
-
 }
 
 void IdentitiesSettingsPage::coreConnectionStateChanged(bool state) {
@@ -92,18 +111,18 @@ void IdentitiesSettingsPage::coreConnectionStateChanged(bool state) {
 
 void IdentitiesSettingsPage::save() {
   setEnabled(false);
-  QList<Identity *> toCreate, toUpdate;
+  QList<CertIdentity *> toCreate, toUpdate;
   // we need to remove our temporarily created identities.
   // these are going to be re-added after the core has propagated them back...
-  QHash<IdentityId, Identity *>::iterator i = identities.begin();
+  QHash<IdentityId, CertIdentity *>::iterator i = identities.begin();
   while(i != identities.end()) {
     if((*i)->id() < 0) {
-      Identity *temp = *i;
+      CertIdentity *temp = *i;
       i = identities.erase(i);
       toCreate.append(temp);
-      ui.identityList->removeItem(ui.identityList->findData(temp->id()));
+      ui.identityList->removeItem(ui.identityList->findData(temp->id().toInt()));
     } else {
-      if(**i != *Client::identity((*i)->id())) {
+      if(**i != *Client::identity((*i)->id()) || (*i)->isDirty()) {
         toUpdate.append(*i);
       }
       ++i;
@@ -120,7 +139,7 @@ void IdentitiesSettingsPage::save() {
   }
   changedIdentities.clear();
   deletedIdentities.clear();
-  changeState(false);
+  setChangedState(false);
   setEnabled(true);
 }
 
@@ -136,12 +155,12 @@ void IdentitiesSettingsPage::load() {
   foreach(IdentityId id, Client::identityIds()) {
     clientIdentityCreated(id);
   }
-  changeState(false);
+  setChangedState(false);
 }
 
 void IdentitiesSettingsPage::widgetHasChanged() {
   bool changed = testHasChanged();
-  if(changed != hasChanged()) changeState(changed);
+  if(changed != hasChanged()) setChangedState(changed);
 }
 
 bool IdentitiesSettingsPage::testHasChanged() {
@@ -151,10 +170,11 @@ bool IdentitiesSettingsPage::testHasChanged() {
   } else {
     if(currentId != 0) {
       changedIdentities.removeAll(currentId);
-      Identity temp(currentId, this);
+      CertIdentity temp(currentId, this);
       saveToIdentity(&temp);
       temp.setIdentityName(identities[currentId]->identityName());
-      if(temp != *Client::identity(currentId)) changedIdentities.append(currentId);
+      if(temp != *Client::identity(currentId) || temp.isDirty())
+	changedIdentities.append(currentId);
     }
     return changedIdentities.count();
   }
@@ -181,7 +201,10 @@ bool IdentitiesSettingsPage::aboutToSave() {
 }
 
 void IdentitiesSettingsPage::clientIdentityCreated(IdentityId id) {
-  insertIdentity(new Identity(*Client::identity(id), this));
+  CertIdentity *identity = new CertIdentity(*Client::identity(id), this);
+  identity->enableEditSsl(_editSsl);
+  insertIdentity(identity);
+  connect(identity, SIGNAL(sslSettingsUpdated()), this, SLOT(clientIdentityUpdated()));
   connect(Client::identity(id), SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated()));
 }
 
@@ -195,10 +218,16 @@ void IdentitiesSettingsPage::clientIdentityUpdated() {
     qWarning() << "Unknown identity to update:" << clientIdentity->identityName();
     return;
   }
-  Identity *identity = identities[clientIdentity->id()];
-  if(identity->identityName() != clientIdentity->identityName()) renameIdentity(identity->id(), clientIdentity->identityName());
+
+  CertIdentity *identity = identities[clientIdentity->id()];
+
+  if(identity->identityName() != clientIdentity->identityName())
+    renameIdentity(identity->id(), clientIdentity->identityName());
+
   identity->update(*clientIdentity);
-  if(identity->id() == currentId) displayIdentity(identity, true);
+
+  if(identity->id() == currentId)
+    displayIdentity(identity, true);
 }
 
 void IdentitiesSettingsPage::clientIdentityRemoved(IdentityId id) {
@@ -209,36 +238,36 @@ void IdentitiesSettingsPage::clientIdentityRemoved(IdentityId id) {
   }
 }
 
-void IdentitiesSettingsPage::insertIdentity(Identity *identity) {
+void IdentitiesSettingsPage::insertIdentity(CertIdentity *identity) {
   IdentityId id = identity->id();
   identities[id] = identity;
   if(id == 1) {
     // default identity is always the first one!
-    ui.identityList->insertItem(0, identity->identityName(), id);
+    ui.identityList->insertItem(0, identity->identityName(), id.toInt());
   } else {
     QString name = identity->identityName();
     for(int j = 0; j < ui.identityList->count(); j++) {
       if((j>0 || ui.identityList->itemData(0).toInt() != 1) && name.localeAwareCompare(ui.identityList->itemText(j)) < 0) {
-        ui.identityList->insertItem(j, name, id);
+        ui.identityList->insertItem(j, name, id.toInt());
         widgetHasChanged();
         return;
       }
     }
     // append
-    ui.identityList->insertItem(ui.identityList->count(), name, id);
+    ui.identityList->insertItem(ui.identityList->count(), name, id.toInt());
     widgetHasChanged();
   }
 }
 
 void IdentitiesSettingsPage::renameIdentity(IdentityId id, const QString &newName) {
   Identity *identity = identities[id];
-  ui.identityList->setItemText(ui.identityList->findData(identity->id()), newName);
+  ui.identityList->setItemText(ui.identityList->findData(identity->id().toInt()), newName);
   identity->setIdentityName(newName);
 }
 
 void IdentitiesSettingsPage::removeIdentity(Identity *id) {
   identities.remove(id->id());
-  ui.identityList->removeItem(ui.identityList->findData(id->id()));
+  ui.identityList->removeItem(ui.identityList->findData(id->id().toInt()));
   changedIdentities.removeAll(id->id());
   if(currentId == id->id()) currentId = 0;
   id->deleteLater();
@@ -257,7 +286,7 @@ void IdentitiesSettingsPage::on_identityList_currentIndexChanged(int index) {
   }
 }
 
-void IdentitiesSettingsPage::displayIdentity(Identity *id, bool dontsave) {
+void IdentitiesSettingsPage::displayIdentity(CertIdentity *id, bool dontsave) {
   if(currentId != 0 && !dontsave && identities.contains(currentId)) {
     saveToIdentity(identities[currentId]);
   }
@@ -274,22 +303,23 @@ void IdentitiesSettingsPage::displayIdentity(Identity *id, bool dontsave) {
     ui.awayNickEnabled->setChecked(id->awayNickEnabled());
     ui.awayReason->setText(id->awayReason());
     ui.awayReasonEnabled->setChecked(id->awayReasonEnabled());
-    ui.returnMessage->setText(id->returnMessage());
-    ui.returnMessageEnabled->setChecked(id->returnMessageEnabled());
     ui.autoAwayEnabled->setChecked(id->autoAwayEnabled());
     ui.autoAwayTime->setValue(id->autoAwayTime());
     ui.autoAwayReason->setText(id->autoAwayReason());
     ui.autoAwayReasonEnabled->setChecked(id->autoAwayReasonEnabled());
-    ui.autoReturnMessage->setText(id->autoReturnMessage());
-    ui.autoReturnMessageEnabled->setChecked(id->autoReturnMessageEnabled());
+    ui.detachAwayEnabled->setChecked(id->detachAwayEnabled());
+    ui.detachAwayReason->setText(id->detachAwayReason());
+    ui.detachAwayReasonEnabled->setChecked(id->detachAwayReasonEnabled());
     ui.ident->setText(id->ident());
     ui.kickReason->setText(id->kickReason());
     ui.partReason->setText(id->partReason());
     ui.quitReason->setText(id->quitReason());
+    showKeyState(id->sslKey());
+    showCertState(id->sslCert());
   }
 }
 
-void IdentitiesSettingsPage::saveToIdentity(Identity *id) {
+void IdentitiesSettingsPage::saveToIdentity(CertIdentity *id) {
   id->setRealName(ui.realName->text());
   QStringList nicks;
   for(int i = 0; i < ui.nicknameList->count(); i++) {
@@ -300,18 +330,19 @@ void IdentitiesSettingsPage::saveToIdentity(Identity *id) {
   id->setAwayNickEnabled(ui.awayNickEnabled->isChecked());
   id->setAwayReason(ui.awayReason->text());
   id->setAwayReasonEnabled(ui.awayReasonEnabled->isChecked());
-  id->setReturnMessage(ui.returnMessage->text());
-  id->setReturnMessageEnabled(ui.returnMessageEnabled->isChecked());
   id->setAutoAwayEnabled(ui.autoAwayEnabled->isChecked());
   id->setAutoAwayTime(ui.autoAwayTime->value());
   id->setAutoAwayReason(ui.autoAwayReason->text());
   id->setAutoAwayReasonEnabled(ui.autoAwayReasonEnabled->isChecked());
-  id->setAutoReturnMessage(ui.autoReturnMessage->text());
-  id->setAutoReturnMessageEnabled(ui.autoReturnMessageEnabled->isChecked());
+  id->setDetachAwayEnabled(ui.detachAwayEnabled->isChecked());
+  id->setDetachAwayReason(ui.detachAwayReason->text());
+  id->setDetachAwayReasonEnabled(ui.detachAwayReasonEnabled->isChecked());
   id->setIdent(ui.ident->text());
   id->setKickReason(ui.kickReason->text());
   id->setPartReason(ui.partReason->text());
   id->setQuitReason(ui.quitReason->text());
+  id->setSslKey(QSslKey(ui.keyTypeLabel->property("sslKey").toByteArray(), (QSsl::KeyAlgorithm)(ui.keyTypeLabel->property("sslKeyType").toInt())));
+  id->setSslCert(QSslCertificate(ui.certOrgLabel->property("sslCert").toByteArray()));
 }
 
 void IdentitiesSettingsPage::on_addIdentity_clicked() {
@@ -320,10 +351,11 @@ void IdentitiesSettingsPage::on_addIdentity_clicked() {
     // find a free (negative) ID
     IdentityId id;
     for(id = 1; id <= identities.count(); id++) {
-      if(!identities.keys().contains(-id)) break;
+      if(!identities.keys().contains(-id.toInt())) break;
     }
-    id *= -1;
-    Identity *newId = new Identity(id, this);
+    id = -id.toInt();
+    CertIdentity *newId = new CertIdentity(id, this);
+    newId->enableEditSsl(_editSsl);
     if(dlg.duplicateId() != 0) {
       // duplicate
       newId->update(*identities[dlg.duplicateId()]);
@@ -332,7 +364,7 @@ void IdentitiesSettingsPage::on_addIdentity_clicked() {
     newId->setIdentityName(dlg.identityName());
     identities[id] = newId;
     insertIdentity(newId);
-    ui.identityList->setCurrentIndex(ui.identityList->findData(id));
+    ui.identityList->setCurrentIndex(ui.identityList->findData(id.toInt()));
     widgetHasChanged();
   }
 }
@@ -363,18 +395,19 @@ void IdentitiesSettingsPage::on_renameIdentity_clicked() {
 void IdentitiesSettingsPage::on_addNick_clicked() {
   QStringList existing;
   for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
-  NickEditDlgNew dlg(QString(), existing, this);
+  NickEditDlg dlg(QString(), existing, this);
   if(dlg.exec() == QDialog::Accepted) {
     ui.nicknameList->addItem(dlg.nick());
     ui.nicknameList->setCurrentRow(ui.nicknameList->count()-1);
     setWidgetStates();
+    widgetHasChanged();
   }
 }
 
 void IdentitiesSettingsPage::on_deleteNick_clicked() {
   // no confirmation, since a nickname is really nothing hard to recreate
   if(ui.nicknameList->selectedItems().count()) {
-    delete ui.nicknameList->selectedItems()[0];
+    delete ui.nicknameList->takeItem(ui.nicknameList->row(ui.nicknameList->selectedItems()[0]));
     ui.nicknameList->setCurrentRow(qMin(ui.nicknameList->currentRow()+1, ui.nicknameList->count()-1));
     setWidgetStates();
     widgetHasChanged();
@@ -386,7 +419,7 @@ void IdentitiesSettingsPage::on_renameNick_clicked() {
   QString old = ui.nicknameList->selectedItems()[0]->text();
   QStringList existing;
   for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
-  NickEditDlgNew dlg(old, existing, this);
+  NickEditDlg dlg(old, existing, this);
   if(dlg.exec() == QDialog::Accepted) {
     ui.nicknameList->selectedItems()[0]->setText(dlg.nick());
   }
@@ -415,9 +448,101 @@ void IdentitiesSettingsPage::on_nickDown_clicked() {
   }
 }
 
+void IdentitiesSettingsPage::on_continueUnsecured_clicked() {
+  _editSsl = true;
+
+  QHash<IdentityId, CertIdentity *>::iterator idIter;
+  for(idIter = identities.begin(); idIter != identities.end(); idIter++) {
+    idIter.value()->enableEditSsl();
+  }
+
+  ui.keyAndCertSettings->setCurrentIndex(2);
+}
+
+void IdentitiesSettingsPage::on_clearOrLoadKeyButton_clicked() {
+  QSslKey key;
+
+  if(ui.keyTypeLabel->property("sslKey").toByteArray().isEmpty()) {
+    QString keyFileName = QFileDialog::getOpenFileName(this, tr("Load a Key"), QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
+    QFile keyFile(keyFileName);
+    keyFile.open(QIODevice::ReadOnly);
+    QByteArray keyRaw = keyFile.read(2 << 20);
+    keyFile.close();
+
+    for(int i = 0; i < 2; i++) {
+      for(int j = 0; j < 2; j++) {
+	key = QSslKey(keyRaw, (QSsl::KeyAlgorithm)j, (QSsl::EncodingFormat)i);
+	if(!key.isNull())
+	  goto showKey;
+      }
+    }
+  }
+
+ showKey:
+  showKeyState(key);
+  widgetHasChanged();
+}
+
+void IdentitiesSettingsPage::showKeyState(const QSslKey &key) {
+  if(key.isNull()) {
+    ui.keyTypeLabel->setText(tr("No Key loaded"));
+    ui.clearOrLoadKeyButton->setText(tr("Load"));
+  } else {
+    switch(key.algorithm()) {
+    case QSsl::Rsa:
+      ui.keyTypeLabel->setText(tr("RSA"));
+      break;
+    case QSsl::Dsa:
+      ui.keyTypeLabel->setText(tr("DSA"));
+      break;
+    default:
+      ui.keyTypeLabel->setText(tr("No Key Loaded"));
+    }
+    ui.clearOrLoadKeyButton->setText(tr("Clear"));
+  }
+  ui.keyTypeLabel->setProperty("sslKey", key.toPem());
+  ui.keyTypeLabel->setProperty("sslKeyType", (int)key.algorithm());
+}
+
+void IdentitiesSettingsPage::on_clearOrLoadCertButton_clicked() {
+  QSslCertificate cert;
+
+  if(ui.certOrgLabel->property("sslCert").toByteArray().isEmpty()) {
+    QString certFileName = QFileDialog::getOpenFileName(this, tr("Load a Certificate"), QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
+    QFile certFile(certFileName);
+    certFile.open(QIODevice::ReadOnly);
+    QByteArray certRaw = certFile.read(2 << 20);
+    certFile.close();
+
+    for(int i = 0; i < 2; i++) {
+      cert = QSslCertificate(certRaw, (QSsl::EncodingFormat)i);
+      if(cert.isValid())
+	break;
+    }
+  }
+
+  showCertState(cert);
+  widgetHasChanged();
+}
+
+void IdentitiesSettingsPage::showCertState(const QSslCertificate &cert) {
+  if(!cert.isValid()) {
+    ui.certOrgLabel->setText(tr("No Certificate loaded"));
+    ui.certCNameLabel->setText(tr("No Certificate loaded"));
+    ui.clearOrLoadCertButton->setText(tr("Load"));
+  } else {
+    ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization));
+    ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName));
+    ui.clearOrLoadCertButton->setText(tr("Clear"));
+  }
+  ui.certOrgLabel->setProperty("sslCert", cert.toPem());
+ }
+
 /*****************************************************************************************/
 
-CreateIdentityDlg::CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent) : QDialog(parent) {
+CreateIdentityDlg::CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent)
+  : QDialog(parent)
+{
   ui.setupUi(this);
 
   ui.identityList->setModel(model);  // now we use the identity list of the main page... Trolltech <3
@@ -443,9 +568,12 @@ void CreateIdentityDlg::on_identityName_textChanged(const QString &text) {
 
 /*********************************************************************************************/
 
-SaveIdentitiesDlg::SaveIdentitiesDlg(QList<Identity *> tocreate, QList<Identity *> toupdate, QList<IdentityId> toremove, QWidget *parent)
-  : QDialog(parent), toCreate(tocreate), toUpdate(toupdate), toRemove(toremove) {
+SaveIdentitiesDlg::SaveIdentitiesDlg(const QList<CertIdentity *> &toCreate, const QList<CertIdentity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent)
+  : QDialog(parent)
+{
   ui.setupUi(this);
+  ui.abort->setIcon(SmallIcon("dialog-cancel"));
+
   numevents = toCreate.count() + toUpdate.count() + toRemove.count();
   rcvevents = 0;
   if(numevents) {
@@ -455,10 +583,10 @@ SaveIdentitiesDlg::SaveIdentitiesDlg(QList<Identity *> tocreate, QList<Identity
     connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientEvent()));
     connect(Client::instance(), SIGNAL(identityRemoved(IdentityId)), this, SLOT(clientEvent()));
 
-    foreach(Identity *id, toCreate) {
+    foreach(CertIdentity *id, toCreate) {
       Client::createIdentity(*id);
     }
-    foreach(Identity *id, toUpdate) {
+    foreach(CertIdentity *id, toUpdate) {
       const Identity *cid = Client::identity(id->id());
       if(!cid) {
         qWarning() << "Invalid client identity!";
@@ -466,7 +594,8 @@ SaveIdentitiesDlg::SaveIdentitiesDlg(QList<Identity *> tocreate, QList<Identity
         continue;
       }
       connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
-      Client::updateIdentity(*id);
+      Client::updateIdentity(id->id(), id->toVariantMap());
+      id->requestUpdateSslSettings();
     }
     foreach(IdentityId id, toRemove) {
       Client::removeIdentity(id);
@@ -484,7 +613,7 @@ void SaveIdentitiesDlg::clientEvent() {
 
 /*************************************************************************************************/
 
-NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent)
+NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent)
   : QDialog(parent), oldNick(old), existing(exist) {
   ui.setupUi(this);
 
@@ -501,12 +630,12 @@ NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWi
   } else ui.nickEdit->setText(old);
 }
 
-QString NickEditDlgNew::nick() const {
+QString NickEditDlg::nick() const {
   return ui.nickEdit->text();
 
 }
 
-void NickEditDlgNew::on_nickEdit_textChanged(const QString &text) {
+void NickEditDlg::on_nickEdit_textChanged(const QString &text) {
   ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
 }