=== modified file 'protocols/jabber/jabber.c'
|
|
|
459 | 459 | else if( jabber_chat_by_jid( ic, room ) ) |
460 | 460 | imcb_error( ic, "Already present in chat `%s'", room ); |
461 | 461 | else |
462 | | return jabber_chat_join( ic, room, nick, set_getstr( sets, "password" ) ); |
| 462 | { |
| 463 | struct jabber_data *jd = ic->proto_data; |
| 464 | |
| 465 | /* Use the JID user name, not the IRC nickname, so that users |
| 466 | can connect to non-anonymous rooms with locked nicknames |
| 467 | (see ticket #415). */ |
| 468 | return jabber_chat_join( ic, room, jd->username, set_getstr( sets, "password" ) ); |
| 469 | } |
463 | 470 | |
464 | 471 | return NULL; |
465 | 472 | } |