CVS commit by gerken: Restricting JID validation to changes in the server and JID field. CCMAIL: 68416-done@bugs.kde.org M +17 -1 jabbereditaccountwidget.cpp 1.24 M +3 -0 jabbereditaccountwidget.h 1.10 --- kdenetwork/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp #1.23:1.24 @@ -56,4 +56,7 @@ JabberEditAccountWidget::JabberEditAccou connect (leProxyPass, SIGNAL (textChanged (const QString &)), this, SLOT (configChanged ())); + connect (mID, SIGNAL (textChanged (const QString &)), this, SLOT (setJIDValidation ())); + connect (mServer, SIGNAL (textChanged (const QString &)), this, SLOT (setJIDValidation ())); + connect (btnRegister, SIGNAL (clicked ()), this, SLOT (registerClicked ())); connect (chkUseSSL, SIGNAL (toggled (bool)), this, SLOT (sslToggled (bool))); @@ -113,4 +116,6 @@ void JabberEditAccountWidget::reopen () mAutoConnect->setChecked (account()->autoLogin()); + revalidateJID = false; + } @@ -119,4 +124,5 @@ KopeteAccount *JabberEditAccountWidget:: kdDebug (14180) << "JabberEditAccount::apply()" << endl; + if(revalidateJID) validateJID(); @@ -262,4 +268,14 @@ void JabberEditAccountWidget::configChan { settings_changed = true; +} + +void JabberEditAccountWidget::setJIDValidation () +{ + + if(account ()->pluginData(m_protocol, "Server") == mServer->text ()) + revalidateJID = false; + else + revalidateJID = true; + } --- kdenetwork/kopete/protocols/jabber/ui/jabbereditaccountwidget.h #1.9:1.10 @@ -48,4 +48,6 @@ public: private: + bool revalidateJID; + void reopen (); void writeConfig (); @@ -56,4 +58,5 @@ private slots: void sslToggled (bool); void configChanged (); + void setJIDValidation (); void validateJID ();