devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-24 18:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into openpgp

Browse Source 
Conflicts:
	src/command/commands.c
	src/command/commands.h
This commit is contained in:
James Booth
2015-06-17 00:40:06 +01:00
parent 637b8bee9f a798dc5618
commit 8fde14879a
25 changed files with 689 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui/console.c
View File

@@ -1564,7 +1564,8 @@ cons_show_contacts(GSList *list)
void
cons_alert(void)
{
if (ui_current_win_type() != WIN_CONSOLE) {
ProfWin *current = wins_get_current();
if (current->type != WIN_CONSOLE) {
status_bar_new(1);
}
}