comparison mcabber/mcabber/commands.c @ 2138:f063e36425a2

Use bookmarked password (if any) when using "/room join" (The password was only used when auto-joining.)
author Mikael Berthe <mikael@lilotux.net>
date Sun, 06 Jul 2014 13:24:06 +0200
parents 0bfc4bfc127c
children 2f294c2b6778
comparison
equal deleted inserted replaced
2137:0bfc4bfc127c 2138:f063e36425a2
2605 free_arg_lst(paramlst); 2605 free_arg_lst(paramlst);
2606 return; 2606 return;
2607 } 2607 }
2608 2608
2609 pass_utf8 = to_utf8(pass); 2609 pass_utf8 = to_utf8(pass);
2610
2611 if (!pass) {
2612 const char *roompass = xmpp_get_bookmark_password(roomname);
2613 if (roompass)
2614 pass_utf8 = g_strdup(roompass);
2615 }
2610 2616
2611 xmpp_room_join(roomname, nick, pass_utf8); 2617 xmpp_room_join(roomname, nick, pass_utf8);
2612 2618
2613 scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname); 2619 scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname);
2614 2620