summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/ui
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/ui')
-rw-r--r--kopete/protocols/jabber/ui/jabberregisteraccount.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index febad40c..f3d01c76 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -250,13 +250,16 @@ void JabberRegisterAccount::slotOk ()
// cancel any previous attempt
jabberClient->disconnect ();
- // FIXME: we need to use the old protocol for now
- jabberClient->setUseXMPP09 ( true );
-
jabberClient->setUseSSL ( mMainWidget->cbUseSSL->isChecked () );
- // FIXME: check this when using the new protocol
- jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () );
+ if( !mMainWidget->leServer->text().isEmpty() ) {
+ jabberClient->setUseXMPP09 ( true );
+ jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () );
+ }
+ else {
+ jabberClient->setUseXMPP09 ( false );
+ jabberClient->setOverrideHost ( false );
+ }
// start connection, no authentication
switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) )