Mercurial > ~mikael > mcabber > hg
diff 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 |
line wrap: on
line diff
--- a/mcabber/mcabber/commands.c Sun Jul 06 13:12:10 2014 +0200 +++ b/mcabber/mcabber/commands.c Sun Jul 06 13:24:06 2014 +0200 @@ -2608,6 +2608,12 @@ pass_utf8 = to_utf8(pass); + if (!pass) { + const char *roompass = xmpp_get_bookmark_password(roomname); + if (roompass) + pass_utf8 = g_strdup(roompass); + } + xmpp_room_join(roomname, nick, pass_utf8); scr_LogPrint(LPRINT_LOGNORM, "Sent a join request to <%s>...", roomname);