devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 22:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into readline

Browse Source 
Conflicts:
	src/ui/inputwin.c
This commit is contained in:
James Booth
2015-02-10 20:47:22 +00:00
parent 64774a947e 6ab937c3e3
commit 13297a151f
4 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/console.c
View File

@@ -251,6 +251,7 @@ cons_show_wins(void)
win_save_println(console, curr->data);
curr = g_slist_next(curr);
}
g_slist_free_full(window_strings, free);
cons_show("");
cons_alert();
@@ -402,17 +403,18 @@ cons_show_sent_subs(void)
GSList *contacts = roster_get_contacts();
PContact contact = NULL;
cons_show("Awaiting subscription responses from:");
while (contacts != NULL) {
contact = (PContact) contacts->data;
GSList *curr = contacts;
while (curr != NULL) {
contact = (PContact) curr->data;
if (p_contact_pending_out(contact)) {
cons_show(" %s", p_contact_barejid(contact));
}
contacts = g_slist_next(contacts);
curr = g_slist_next(curr);
}
g_slist_free(contacts);
} else {
cons_show("No pending requests sent.");
}
cons_alert();
}