devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Pass offline filter to roster_get_contacts

Browse Source
This commit is contained in:
James Booth
2015-11-18 01:03:35 +00:00
parent b373cbcfc0
commit 4efe456e74
8 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/command/commands.c
View File

@@ -1326,7 +1326,7 @@ _who_roster(ProfWin *window, const char *const command, gchar **args)
return;
}
} else {
list = roster_get_contacts(ROSTER_ORD_NAME);
list = roster_get_contacts(ROSTER_ORD_NAME, TRUE);
if (list == NULL) {
cons_show("No contacts in roster.");
return;
@@ -1711,7 +1711,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
GSList *list = roster_get_contacts(ROSTER_ORD_NAME);
GSList *list = roster_get_contacts(ROSTER_ORD_NAME, TRUE);
cons_show_roster(list);
g_slist_free(list);
return TRUE;
@@ -1931,7 +1931,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
GSList *all = roster_get_contacts(ROSTER_ORD_NAME);
GSList *all = roster_get_contacts(ROSTER_ORD_NAME, TRUE);
GSList *curr = all;
while (curr) {
PContact contact = curr->data;

2
src/config/preferences.c
View File

@@ -865,7 +865,7 @@ _get_default_string(preference_t pref)
case PREF_ROSTER_BY:
return "presence";
case PREF_ROSTER_ORDER:
return "name";
return "presence";
case PREF_TIME_CONSOLE:
return "%H:%M:%S";
case PREF_TIME_CHAT:

8
src/roster_list.c
View File

@@ -383,7 +383,7 @@ roster_get_contacts_by_presence(const char *const presence)
}
GSList*
roster_get_contacts(roster_ord_t order)
roster_get_contacts(roster_ord_t order, gboolean include_offline)
{
GSList *result = NULL;
GHashTableIter iter;
@@ -399,6 +399,12 @@ roster_get_contacts(roster_ord_t order)
g_hash_table_iter_init(&iter, contacts);
while (g_hash_table_iter_next(&iter, &key, &value)) {
PContact contact = value;
const char *presence = p_contact_presence(contact);
if (!include_offline && (g_strcmp0(presence, "offline") == 0)) {
continue;
}
result = g_slist_insert_sorted(result, value, cmp_func);
}

2
src/roster_list.h
View File

@@ -59,7 +59,7 @@ void roster_update(const char *const barejid, const char *const name, GSList *gr
gboolean roster_add(const char *const barejid, const char *const name, GSList *groups, const char *const subscription,
gboolean pending_out);
char* roster_barejid_from_name(const char *const name);
GSList* roster_get_contacts(roster_ord_t order);
GSList* roster_get_contacts(roster_ord_t order, gboolean include_offline);
GSList* roster_get_contacts_online(void);
gboolean roster_has_pending_subscriptions(void);
char* roster_contact_autocomplete(const char *const search_str);

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(ROSTER_ORD_NAME);
GSList *contacts = roster_get_contacts(ROSTER_ORD_NAME, TRUE);
PContact contact = NULL;
cons_show("Awaiting subscription responses from:");
GSList *curr = contacts;

46
src/ui/rosterwin.c
View File

@@ -115,22 +115,19 @@ _rosterwin_contact(ProfLayoutSplit *layout, PContact contact)
const char *presence = p_contact_presence(contact);
const char *status = p_contact_status(contact);
if ((g_strcmp0(presence, "offline") != 0) || ((g_strcmp0(presence, "offline") == 0) &&
(prefs_get_boolean(PREF_ROSTER_OFFLINE)))) {
theme_item_t presence_colour = theme_main_presence_attrs(presence);
theme_item_t presence_colour = theme_main_presence_attrs(presence);
wattron(layout->subwin, theme_attrs(presence_colour));
GString *msg = g_string_new(" ");
g_string_append(msg, name);
win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(presence_colour));
wattron(layout->subwin, theme_attrs(presence_colour));
GString *msg = g_string_new(" ");
g_string_append(msg, name);
win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(presence_colour));
if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) {
_rosterwin_resource(layout, contact);
} else if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) {
_rosterwin_presence(layout, 4, presence_colour, presence, status);
}
if (prefs_get_boolean(PREF_ROSTER_RESOURCE)) {
_rosterwin_resource(layout, contact);
} else if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) {
_rosterwin_presence(layout, 4, presence_colour, presence, status);
}
}
@@ -170,7 +167,7 @@ _rosterwin_contacts_by_group(ProfLayoutSplit *layout, char *group)
contacts = roster_get_group(group, ROSTER_ORD_NAME, offline);
}
if (contacts) {
if (contacts || prefs_get_boolean(PREF_ROSTER_EMPTY)) {
wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
GString *title = g_string_new(" -");
g_string_append(title, group);
@@ -201,7 +198,7 @@ _rosterwin_contacts_by_no_group(ProfLayoutSplit *layout)
contacts = roster_get_nogroup(ROSTER_ORD_NAME, offline);
}
if (contacts) {
if (contacts || prefs_get_boolean(PREF_ROSTER_EMPTY)) {
wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
win_printline_nowrap(layout->subwin, " -no group");
wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
@@ -249,19 +246,20 @@ rosterwin_roster(void)
GSList *contacts = NULL;
char *order = prefs_get_string(PREF_ROSTER_ORDER);
gboolean offline = prefs_get_boolean(PREF_ROSTER_OFFLINE);
if (g_strcmp0(order, "presence") == 0) {
contacts = roster_get_contacts(ROSTER_ORD_PRESENCE);
contacts = roster_get_contacts(ROSTER_ORD_PRESENCE, offline);
} else {
contacts = roster_get_contacts(ROSTER_ORD_NAME);
contacts = roster_get_contacts(ROSTER_ORD_NAME, offline);
}
werase(layout->subwin);
wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
win_printline_nowrap(layout->subwin, " -Roster");
wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
if (contacts) {
werase(layout->subwin);
wattron(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
win_printline_nowrap(layout->subwin, " -Roster");
wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
GSList *curr_contact = contacts;
while (curr_contact) {
PContact contact = curr_contact->data;