devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Fix room notification reminders

Browse Source
This commit is contained in:
James Booth
2016-02-07 01:15:40 +00:00
parent abc2f0de39
commit 62b0cdd8fd
6 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/ui.h
View File

@@ -345,7 +345,7 @@ ProfWin* win_create_muc_config(const char *const title, DataForm *form);
ProfWin* win_create_private(const char *const fulljid);
void win_update_virtual(ProfWin *window);
void win_free(ProfWin *window);
gboolean win_notify(ProfWin *window);
gboolean win_notify_remind(ProfWin *window);
int win_unread(ProfWin *window);
void win_resize(ProfWin *window);
void win_hide_subwin(ProfWin *window);

12
src/ui/window.c
View File

@@ -1308,7 +1308,7 @@ win_has_active_subwin(ProfWin *window)
}
gboolean
win_notify(ProfWin *window)
win_notify_remind(ProfWin *window)
{
switch (window->type) {
case WIN_CHAT:
@@ -1327,15 +1327,7 @@ win_notify(ProfWin *window)
ProfMucWin *mucwin = (ProfMucWin*) window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
if (prefs_get_room_notify(mucwin->roomjid) && mucwin->unread > 0) {
return TRUE;
} else if (prefs_get_room_notify_mention(mucwin->roomjid) && mucwin->unread_mentions) {
return TRUE;
} else if (prefs_get_room_notify_trigger(mucwin->roomjid) && mucwin->unread_triggers) {
return TRUE;
} else {
return FALSE;
}
return prefs_do_room_notify_mention(mucwin->roomjid, mucwin->unread, mucwin->unread_mentions, mucwin->unread_triggers);
}
case WIN_PRIVATE:
{