1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into caps

This commit is contained in:
James Booth 2013-01-21 22:57:56 +00:00
commit 42e7f47175

View File

@ -725,7 +725,16 @@ win_new_chat_win(const char * const to)
// create new window // create new window
if (win_index == NUM_WINS) { if (win_index == NUM_WINS) {
win_index = _new_prof_win(to, WIN_CHAT); Jid *jid = jid_create(to);
if (muc_room_is_active(jid)) {
win_index = _new_prof_win(to, WIN_PRIVATE);
} else {
win_index = _new_prof_win(to, WIN_CHAT);
}
jid_destroy(jid);
win = windows[win_index]->win; win = windows[win_index]->win;
if (prefs_get_chlog() && prefs_get_history()) { if (prefs_get_chlog() && prefs_get_history()) {