[gentoo-commits] gentoo-x86 commit in kde-base/kopete/files: kopete-4.11.2-jabber-connect2.patch kopete-4.11.2-jabber-connect.patch

[Johannes Huber (johu)]

johu        13/10/25 21:09:06

  Added:                kopete-4.11.2-jabber-connect2.patch
                        kopete-4.11.2-jabber-connect.patch
  Log:
  Revision bump adds upstream patches which fixes connection issues to some jabber server like facebook fixes bug #483790.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

Revision  Changes    Path
1.1                  kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch?rev=1.1&content-type=text/plain

Index: kopete-4.11.2-jabber-connect2.patch
===================================================================
commit 7801dae888e6fd145e6755e9f89d2bf04092bf4a
Author: Pali Rohár <pali.rohar@×××××.com>
Date:   Mon Oct 21 12:45:37 2013 +0200

    Fix JabberResourcePool::lockToResource
    
    When locking contact to resource check only for bare JID. It does not make sense to check for full JID with (maybe old/bad) resource name
    
    CCBUG: 324937

diff --git a/protocols/jabber/jabberresourcepool.cpp b/protocols/jabber/jabberresourcepool.cpp
index de2b2bf..27330a7 100644
--- a/protocols/jabber/jabberresourcepool.cpp
+++ b/protocols/jabber/jabberresourcepool.cpp
@@ -220,7 +220,7 @@ void JabberResourcePool::clear ()
 
 void JabberResourcePool::lockToResource ( const XMPP::Jid &jid, const XMPP::Resource &resource )
 {
-	kDebug(JABBER_DEBUG_GLOBAL) << "Locking " << jid.full() << " to " << resource.name();
+	kDebug(JABBER_DEBUG_GLOBAL) << "Locking " << jid.bare() << " to " << resource.name();
 
 	// remove all existing locks first
 	removeLock ( jid );
@@ -228,7 +228,7 @@ void JabberResourcePool::lockToResource ( const XMPP::Jid &jid, const XMPP::Reso
 	// find the resource in our dictionary that matches
 	foreach(JabberResource *mResource, d->pool)
 	{
-		if ( (mResource->jid().bare().toLower() == jid.full().toLower()) && (mResource->resource().name().toLower() == resource.name().toLower()) )
+		if ( (mResource->jid().bare().toLower() == jid.bare().toLower()) && (mResource->resource().name().toLower() == resource.name().toLower()) )
 		{
 			d->lockList.append ( mResource );
 			return;



1.1                  kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch?rev=1.1&content-type=text/plain

Index: kopete-4.11.2-jabber-connect.patch
===================================================================
commit dd536999ce5611ad5d80adb813f7857ab29f20d4
Author: Pali Rohár <pali.rohar@×××××.com>
Date:   Mon Oct 21 15:33:54 2013 +0200

    Do not allow overwriting bare jid of myself account in jabber client
    
    Kopete account id and myself contact id cannot be changed. This means that all
    jabber code must use bare jid for myself contact specified in account dialog.
    Jabber server can change user jid after successfull login, but there is no
    way in Kopete to propage it. So allow changing only of resource name and do not
    tell other Kopete code about bare jid changes (which is account id and myself
    contact id). Chaning resource name is OK. Without this patch it is not possible
    to login to jabber servers which chaning bare jid (e.g facebook).
    
    BUG: 324937
    FIXED-IN: 4.12

diff --git a/protocols/jabber/jabberclient.cpp b/protocols/jabber/jabberclient.cpp
index c1d5f58..b96241e 100644
--- a/protocols/jabber/jabberclient.cpp
+++ b/protocols/jabber/jabberclient.cpp
@@ -1059,9 +1059,8 @@ void JabberClient::slotCSAuthenticated ()
 		d->jabberClient->s5bManager()->setServer ( s5bServer () );
 	}
 
-	
-	//update the resource:
-	d->jid = d->jabberClientStream->jid();
+	// update only resource and do not change bare jid, see bug 324937
+	d->jid = XMPP::Jid ( d->jid.node(), d->jid.domain(), d->jabberClientStream->jid().resource() );
 
 	// start the client operation
 	d->jabberClient->start ( jid().domain (), jid().node (), d->password, jid().resource () );