aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Tidy up /status

Browse Source
This commit is contained in:
James Booth 2012-11-13 22:14:40 +00:00
parent e506986ef5
commit fd4d00cdd2
1 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/windows.c
View File

@ -813,13 +813,11 @@ win_show_status(const char * const contact)
{ {
PContact pcontact = contact_list_get_contact(contact); PContact pcontact = contact_list_get_contact(contact);
cons_show("");
if (pcontact != NULL) { if (pcontact != NULL) {
_cons_show_contact(pcontact); _cons_show_contact(pcontact);
} else { } else {
cons_show("No such contact %s in roster.", contact); cons_show("No such contact %s in roster.", contact);
} }
cons_show("");
} }
void void
@ -1032,7 +1030,9 @@ cons_show_contacts(GSList *list)
while(curr) { while(curr) {
PContact contact = curr->data; PContact contact = curr->data;
if (strcmp(p_contact_subscription(contact), "none") != 0) {
_cons_show_contact(contact); _cons_show_contact(contact);
}
curr = g_slist_next(curr); curr = g_slist_next(curr);
} }
} }
@ -1517,9 +1517,7 @@ _cons_show_contact(PContact contact)
const char *name = p_contact_name(contact); const char *name = p_contact_name(contact);
const char *presence = p_contact_presence(contact); const char *presence = p_contact_presence(contact);
const char *status = p_contact_status(contact); const char *status = p_contact_status(contact);
const char *sub = p_contact_subscription(contact);
if (strcmp(sub, "none") != 0) {
_win_show_time(_cons_win); _win_show_time(_cons_win);
if (strcmp(presence, "online") == 0) { if (strcmp(presence, "online") == 0) {
@ -1564,7 +1562,6 @@ _cons_show_contact(PContact contact)
wattroff(_cons_win, COLOUR_OFFLINE); wattroff(_cons_win, COLOUR_OFFLINE);
} }
} }
}
static void static void
_win_handle_switch(const int * const ch) _win_handle_switch(const int * const ch)