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

Added settings for message notifications in current window

Browse Source
This commit is contained in:
James Booth
2014-05-24 20:46:03 +01:00
parent 8e14946aad
commit eb0f0dd96b
6 changed files with 107 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/console.c
View File

@@ -1163,8 +1163,18 @@ _cons_notify_setting(void)
else
cons_show("Messages (/notify message) : OFF");
if (prefs_get_boolean(PREF_NOTIFY_MESSAGE_CURRENT))
cons_show("Messages current (/notify message) : ON");
else
cons_show("Messages current (/notify message) : OFF");
char *room_setting = prefs_get_string(PREF_NOTIFY_ROOM);
cons_show ("Chat room messages (/notify room) : %s", room_setting);
cons_show ("Room messages (/notify room) : %s", room_setting);
if (prefs_get_boolean(PREF_NOTIFY_ROOM_CURRENT))
cons_show("Room current (/notify room) : ON");
else
cons_show("Room current (/notify room) : OFF");
if (prefs_get_boolean(PREF_NOTIFY_TYPING))
cons_show("Composing (/notify typing) : ON");

21
src/ui/core.c
View File

@@ -370,8 +370,12 @@ _ui_incoming_msg(const char * const from, const char * const message,
if (prefs_get_boolean(PREF_BEEP))
beep();
if (prefs_get_boolean(PREF_NOTIFY_MESSAGE))
notify_message(display_from, ui_index);
if (prefs_get_boolean(PREF_NOTIFY_MESSAGE)) {
gboolean is_current = wins_is_current(window);
if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_MESSAGE_CURRENT)) ) {
notify_message(display_from, ui_index);
}
}
free(display_from);
@@ -1696,8 +1700,9 @@ _ui_room_message(const char * const room_jid, const char * const nick,
if (prefs_get_boolean(PREF_BEEP)) {
beep();
}
char *room_setting = prefs_get_string(PREF_NOTIFY_ROOM);
gboolean notify = FALSE;
char *room_setting = prefs_get_string(PREF_NOTIFY_ROOM);
if (g_strcmp0(room_setting, "on") == 0) {
notify = TRUE;
}
@@ -1710,10 +1715,14 @@ _ui_room_message(const char * const room_jid, const char * const nick,
g_free(message_lower);
g_free(nick_lower);
}
if (notify) {
Jid *jidp = jid_create(room_jid);
notify_room_message(nick, jidp->localpart, ui_index);
jid_destroy(jidp);
gboolean is_current = wins_is_current(window);
if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_ROOM_CURRENT)) ) {
Jid *jidp = jid_create(room_jid);
notify_room_message(nick, jidp->localpart, ui_index);
jid_destroy(jidp);
}
}
}