Commit dd536999 authored by Pali Rohár's avatar Pali Rohár
Browse files

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
parent 7801dae8
......@@ -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 () );
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment