aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into openpgp

Browse Source
This commit is contained in:
James Booth 2015-05-10 01:45:07 +01:00
commit 58b5e39b95
1 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ui/core.c
View File

@ -1748,7 +1748,9 @@ ui_room_message(const char * const roomjid, const char * const nick,
ProfMucWin *mucwin = wins_get_muc(roomjid);
if (mucwin == NULL) {
log_error("Room message received from %s, but no window open for %s", nick, roomjid);
} else {
return;
}
ProfWin *window = (ProfWin*) mucwin;
int num = wins_get_num(window);
char *my_nick = muc_nick(roomjid);
@ -1772,11 +1774,9 @@ ui_room_message(const char * const roomjid, const char * const nick,
status_bar_new(num);
cons_show_incoming_message(nick, num);
if (strcmp(nick, my_nick) != 0) {
if (prefs_get_boolean(PREF_FLASH)) {
if (prefs_get_boolean(PREF_FLASH) && (strcmp(nick, my_nick) != 0)) {
flash();
}
}
mucwin->unread++;
}
@ -1786,7 +1786,11 @@ ui_room_message(const char * const roomjid, const char * const nick,
ui_index = 0;
}
if (strcmp(nick, muc_nick(roomjid)) != 0) {
// don't notify self messages
if (strcmp(nick, my_nick) == 0) {
return;
}
if (prefs_get_boolean(PREF_BEEP)) {
beep();
}
@ -1819,8 +1823,6 @@ ui_room_message(const char * const roomjid, const char * const nick,
jid_destroy(jidp);
}
}
}
}
}
void