Added notification setting for typing in current window

This commit is contained in:
James Booth
2014-05-24 21:13:33 +01:00
parent eb0f0dd96b
commit b25b3f3180
7 changed files with 57 additions and 16 deletions

View File

@@ -1181,6 +1181,11 @@ _cons_notify_setting(void)
else
cons_show("Composing (/notify typing) : OFF");
if (prefs_get_boolean(PREF_NOTIFY_TYPING_CURRENT))
cons_show("Composing current (/notify typing) : ON");
else
cons_show("Composing current (/notify typing) : OFF");
if (prefs_get_boolean(PREF_NOTIFY_INVITE))
cons_show("Room invites (/notify invite) : ON");
else

View File

@@ -277,14 +277,17 @@ _ui_contact_typing(const char * const barejid)
}
if (prefs_get_boolean(PREF_NOTIFY_TYPING)) {
PContact contact = roster_get_contact(barejid);
char const *display_usr = NULL;
if (p_contact_name(contact) != NULL) {
display_usr = p_contact_name(contact);
} else {
display_usr = barejid;
gboolean is_current = wins_is_current(window);
if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_TYPING_CURRENT)) ) {
PContact contact = roster_get_contact(barejid);
char const *display_usr = NULL;
if (p_contact_name(contact) != NULL) {
display_usr = p_contact_name(contact);
} else {
display_usr = barejid;
}
notify_typing(display_usr);
}
notify_typing(display_usr);
}
}