Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-03-29 00:59:42 +00:00
11 changed files with 196 additions and 30 deletions

View File

@@ -1878,7 +1878,7 @@ cmd_info(gchar **args, struct cmd_help_t help)
}
} else {
ProfMucWin *mucwin = wins_get_current_muc();
iq_room_info_request(mucwin->roomjid);
iq_room_info_request(mucwin->roomjid, TRUE);
ui_show_room_info(mucwin);
return TRUE;
}