[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2013-05-21 15:28:15
Message-ID: 20130521152815.9C167AC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1355857 by pali:

If custom server option in jabber protocol is unchecked, clear it also in jabber client object


 M  +9 -2      jabberaccount.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberaccount.cpp #1355856:1355857
@@ -346,12 +346,19 @@
 	// clean up old client backend
 	m_jabberClient->disconnect ();
 
-	if (configGroup()->readEntry("CustomServer",false))
+	bool customServer = configGroup()->readEntry("CustomServer", false);
+
+	if ( customServer )
 	{
-		m_jabberClient->setUseXMPP09 ( configGroup()->readEntry("CustomServer",false) );
+		m_jabberClient->setUseXMPP09 ( true );
 		// override server and port (this should be dropped when using the new protocol and no direct SSL)
 		m_jabberClient->setOverrideHost ( true, server (), port () );
 	}
+	else
+	{
+		m_jabberClient->setUseXMPP09 ( false );
+		m_jabberClient->setOverrideHost ( false );
+	}
 
 	// set SSL flag (this should be converted to forceTLS when using the new protocol)
 	m_jabberClient->setUseSSL ( configGroup()->readEntry ( "UseSSL", false ) );
[prev in list] [next in list] [prev in thread] [next in thread]