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

Tidy rosterwin.c

Browse Source
This commit is contained in:
James Booth
2015-11-15 23:28:24 +00:00
parent 1d9d893ec0
commit 230a14219c
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ui/rosterwin.c
View File

@@ -93,29 +93,7 @@ _rosterwin_resource(ProfLayoutSplit *layout, PContact contact)
wattroff(layout->subwin, theme_attrs(resource_presence_colour)); wattroff(layout->subwin, theme_attrs(resource_presence_colour));
if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) { if (prefs_get_boolean(PREF_ROSTER_PRESENCE)) {
char *by = prefs_get_string(PREF_ROSTER_BY); _rosterwin_presence(layout, 6, resource_presence_colour, resource_presence, resource->status);
gboolean by_presence = g_strcmp0(by, "presence") == 0;
gboolean has_status = resource->status != NULL;
gboolean show_status = prefs_get_boolean(PREF_ROSTER_STATUS);
if (!by_presence || (has_status && show_status)) {
wattron(layout->subwin, theme_attrs(resource_presence_colour));
GString *msg = g_string_new(" ");
if (!by_presence) {
g_string_append(msg, resource_presence);
}
if (has_status && show_status) {
if (!by_presence) {
g_string_append(msg, ", \"");
} else {
g_string_append(msg, "\"");
}
g_string_append(msg, resource->status);
g_string_append(msg, "\"");
}
win_printline_nowrap(layout->subwin, msg->str);
g_string_free(msg, TRUE);
wattroff(layout->subwin, theme_attrs(resource_presence_colour));
}
} }
curr_resource = g_list_next(curr_resource); curr_resource = g_list_next(curr_resource);