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

Pass ordering to roster list functions

Browse Source
This commit is contained in:
James Booth
2015-11-18 00:06:00 +00:00
parent 8e8852fa9f
commit 2260e3bd6f
7 changed files with 54 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/console.c
View File

@@ -527,7 +527,7 @@ void
cons_show_sent_subs(void)
{
if (roster_has_pending_subscriptions()) {
GSList *contacts = roster_get_contacts();
GSList *contacts = roster_get_contacts(ROSTER_ORD_NAME);
PContact contact = NULL;
cons_show("Awaiting subscription responses from:");
GSList *curr = contacts;

12
src/ui/rosterwin.c
View File

@@ -171,9 +171,9 @@ _rosterwin_contacts_by_group(ProfLayoutSplit *layout, char *group)
char *order = prefs_get_string(PREF_ROSTER_ORDER);
if (g_strcmp0(order, "presence") == 0) {
contacts = roster_get_group_ord_presence(group);
contacts = roster_get_group(group, ROSTER_ORD_PRESENCE);
} else {
contacts = roster_get_group(group);
contacts = roster_get_group(group, ROSTER_ORD_NAME);
}
if (contacts) {
@@ -194,9 +194,9 @@ _rosterwin_contacts_by_no_group(ProfLayoutSplit *layout)
char *order = prefs_get_string(PREF_ROSTER_ORDER);
if (g_strcmp0(order, "presence") == 0) {
contacts = roster_get_nogroup_ord_presence();
contacts = roster_get_nogroup(ROSTER_ORD_PRESENCE);
} else {
contacts = roster_get_nogroup();
contacts = roster_get_nogroup(ROSTER_ORD_NAME);
}
if (contacts) {
@@ -248,9 +248,9 @@ rosterwin_roster(void)
char *order = prefs_get_string(PREF_ROSTER_ORDER);
if (g_strcmp0(order, "presence") == 0) {
contacts = roster_get_contacts_ord_presence();
contacts = roster_get_contacts(ROSTER_ORD_PRESENCE);
} else {
contacts = roster_get_contacts();
contacts = roster_get_contacts(ROSTER_ORD_NAME);
}
if (contacts) {