Ticket #21: no-nickname-change-error.patch

kmess/settings/accountswidget.cpp

@@ -276 +276 @@
   QString   imageName     = 0;
   QString   tempImageName = 0;
   QString   initialStatus;
+  QString   newFriendlyName;
   QDir      imageFolder;
   bool      showImage;
   bool      success;
@@ -292 +293 @@
     }
   }
 
+  // If the account is not verified, don't change the nickname.
+  if( ! account->isVerified() )
+  {
+    newFriendlyName = account->getFriendlyName();
+  }
+  else
+  {
+    newFriendlyName = friendlyNameEdit_->text();
+  }
+
   // Update the settings
-  account->setLoginInformation( handleEdit_->text(), friendlyNameEdit_->text(), passwordEdit_->password() );
+  account->setLoginInformation( handleEdit_->text(), newFriendlyName, passwordEdit_->password() );
   account->setUseAutologin( autologinCheckBox_->isChecked() );
   account->setShowImage( showImage );
 

kmess/account.cpp

@@ -1192 +1192 @@
   ||  ( ! password.isEmpty() && password != password_ ) )
   {
     handle_       = handle.lower();
-    friendlyName_ = friendlyName;
-    emit changedFriendlyName();
 
+    // Never change the nickname if the account is not verified. We would receive a server error
+    if( verified_ )
+    {
+      friendlyName_ = friendlyName;
+      emit changedFriendlyName();
+    }
+
     if( ! password.isEmpty() )
     {
       password_ = password;