diff options
| author | James Booth <boothj5@gmail.com> | 2013-10-06 23:46:35 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-10-06 23:46:35 +0100 |
| commit | 1d3256ffc7af7a575d692b796930868922a72e85 (patch) | |
| tree | 0254a87604afaaf2173c25df82e73e04885e44d5 /src/ui | |
| parent | 7eb5bb6c3d340bd15339962a6b646481c046d69a (diff) | |
| download | profani-tty-1d3256ffc7af7a575d692b796930868922a72e85.tar.gz | |
PREF_STATUSES, moved checks to profanity module
Removed checks from muc presence, and when contact is offline on message
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/core.c | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index af71bb00..682f7a55 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -400,15 +400,13 @@ ui_contact_online(const char * const barejid, const char * const resource, } ProfWin *console = wins_get_console(); - ProfWin *window = wins_get_by_recipient(barejid); + _show_status_string(console, display_str->str, show, status, last_activity, + "++", "online"); - if (prefs_get_boolean(PREF_STATUSES)) { - _show_status_string(console, display_str->str, show, status, last_activity, - "++", "online"); - if (window != NULL) { - _show_status_string(window, display_str->str, show, status, - last_activity, "++", "online"); - } + ProfWin *window = wins_get_by_recipient(barejid); + if (window != NULL) { + _show_status_string(window, display_str->str, show, status, + last_activity, "++", "online"); } jid_destroy(jid); @@ -444,15 +442,13 @@ ui_contact_offline(const char * const from, const char * const show, } ProfWin *console = wins_get_console(); - ProfWin *window = wins_get_by_recipient(jidp->barejid); + _show_status_string(console, display_str->str, show, status, NULL, "--", + "offline"); - if (prefs_get_boolean(PREF_STATUSES)) { - _show_status_string(console, display_str->str, show, status, NULL, "--", + ProfWin *window = wins_get_by_recipient(jidp->barejid); + if (window != NULL) { + _show_status_string(window, display_str->str, show, status, NULL, "--", "offline"); - if (window != NULL) { - _show_status_string(window, display_str->str, show, status, NULL, "--", - "offline"); - } } jid_destroy(jidp); @@ -926,9 +922,7 @@ ui_new_chat_win(const char * const to) if (strcmp(p_contact_presence(contact), "offline") == 0) { const char const *show = p_contact_presence(contact); const char const *status = p_contact_status(contact); - if (prefs_get_boolean(PREF_STATUSES)) { - _show_status_string(window, to, show, status, NULL, "--", "offline"); - } + _show_status_string(window, to, show, status, NULL, "--", "offline"); } } } else { @@ -1036,9 +1030,7 @@ ui_outgoing_msg(const char * const from, const char * const to, if (strcmp(p_contact_presence(contact), "offline") == 0) { const char const *show = p_contact_presence(contact); const char const *status = p_contact_status(contact); - if (prefs_get_boolean(PREF_STATUSES)) { - _show_status_string(window, to, show, status, NULL, "--", "offline"); - } + _show_status_string(window, to, show, status, NULL, "--", "offline"); } } @@ -1169,9 +1161,7 @@ ui_room_member_presence(const char * const room, const char * const nick, ProfWin *window = wins_get_by_recipient(room); if (window != NULL) { - if (prefs_get_boolean(PREF_STATUSES)) { - _show_status_string(window, nick, show, status, NULL, "++", "online"); - } + _show_status_string(window, nick, show, status, NULL, "++", "online"); } if (wins_is_current(window)) { |