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

Rename win_vprint -> win_printf

Browse Source
This commit is contained in:
James Booth
2016-10-11 23:10:48 +01:00
parent 095c129a6b
commit 0337c5b22c
11 changed files with 214 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/ui/window.c
View File

@@ -684,10 +684,10 @@ win_show_occupant(ProfWin *window, Occupant *occupant)
theme_item_t presence_colour = theme_main_presence_attrs(presence_str);
win_print(window, '-', 0, NULL, NO_EOL, presence_colour, "", occupant->nick);
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str);
if (occupant->status) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status);
}
win_print(window, '-', 0, NULL, NO_DATE, presence_colour, "", "");
@@ -710,7 +710,7 @@ win_show_contact(ProfWin *window, PContact contact)
win_print(window, '-', 0, NULL, NO_EOL, presence_colour, "", barejid);
}
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence);
if (last_activity) {
GDateTime *now = g_date_time_new_now_local();
@@ -724,15 +724,15 @@ win_show_contact(ProfWin *window, PContact contact)
int seconds = span / G_TIME_SPAN_SECOND;
if (hours > 0) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", idle %dh%dm%ds", hours, minutes, seconds);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", idle %dh%dm%ds", hours, minutes, seconds);
}
else {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", idle %dm%ds", minutes, seconds);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", idle %dm%ds", minutes, seconds);
}
}
if (status) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", p_contact_status(contact));
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", p_contact_status(contact));
}
win_print(window, '-', 0, NULL, NO_DATE, presence_colour, "", "");
@@ -748,20 +748,20 @@ win_show_occupant_info(ProfWin *window, const char *const room, Occupant *occupa
theme_item_t presence_colour = theme_main_presence_attrs(presence_str);
win_print(window, '!', 0, NULL, NO_EOL, presence_colour, "", occupant->nick);
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str);
win_printf(window, '!', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str);
if (occupant->status) {
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status);
win_printf(window, '!', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status);
}
win_newline(window);
if (occupant->jid) {
win_vprint(window, '!', 0, NULL, 0, 0, "", " Jid: %s", occupant->jid);
win_printf(window, '!', 0, NULL, 0, 0, "", " Jid: %s", occupant->jid);
}
win_vprint(window, '!', 0, NULL, 0, 0, "", " Affiliation: %s", occupant_affiliation);
win_vprint(window, '!', 0, NULL, 0, 0, "", " Role: %s", occupant_role);
win_printf(window, '!', 0, NULL, 0, 0, "", " Affiliation: %s", occupant_affiliation);
win_printf(window, '!', 0, NULL, 0, 0, "", " Role: %s", occupant_role);
Jid *jidp = jid_create_from_bare_and_resource(room, occupant->nick);
EntityCapabilities *caps = caps_lookup(jidp->fulljid);
@@ -793,19 +793,19 @@ win_show_occupant_info(ProfWin *window, const char *const room, Occupant *occupa
if (caps->software_version) {
SoftwareVersion *software_version = caps->software_version;
if (software_version->software) {
win_vprint(window, '!', 0, NULL, NO_EOL, 0, "", " Software: %s", software_version->software);
win_printf(window, '!', 0, NULL, NO_EOL, 0, "", " Software: %s", software_version->software);
}
if (software_version->software_version) {
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
win_printf(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
}
if (software_version->software || software_version->software_version) {
win_newline(window);
}
if (software_version->os) {
win_vprint(window, '!', 0, NULL, NO_EOL, 0, "", " OS: %s", software_version->os);
win_printf(window, '!', 0, NULL, NO_EOL, 0, "", " OS: %s", software_version->os);
}
if (software_version->os_version) {
win_vprint(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
win_printf(window, '!', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
}
if (software_version->os || software_version->os_version) {
win_newline(window);
@@ -832,12 +832,12 @@ win_show_info(ProfWin *window, PContact contact)
win_print(window, '-', 0, NULL, 0, 0, "", "");
win_print(window, '-', 0, NULL, NO_EOL, presence_colour, "", barejid);
if (name) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " (%s)", name);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " (%s)", name);
}
win_print(window, '-', 0, NULL, NO_DATE, 0, "", ":");
if (sub) {
win_vprint(window, '-', 0, NULL, 0, 0, "", "Subscription: %s", sub);
win_printf(window, '-', 0, NULL, 0, 0, "", "Subscription: %s", sub);
}
if (last_activity) {
@@ -851,10 +851,10 @@ win_show_info(ProfWin *window, PContact contact)
int seconds = span / G_TIME_SPAN_SECOND;
if (hours > 0) {
win_vprint(window, '-', 0, NULL, 0, 0, "", "Last activity: %dh%dm%ds", hours, minutes, seconds);
win_printf(window, '-', 0, NULL, 0, 0, "", "Last activity: %dh%dm%ds", hours, minutes, seconds);
}
else {
win_vprint(window, '-', 0, NULL, 0, 0, "", "Last activity: %dm%ds", minutes, seconds);
win_printf(window, '-', 0, NULL, 0, 0, "", "Last activity: %dm%ds", minutes, seconds);
}
g_date_time_unref(now);
@@ -881,9 +881,9 @@ win_show_info(ProfWin *window, PContact contact)
Resource *resource = curr->data;
const char *resource_presence = string_from_resource_presence(resource->presence);
theme_item_t presence_colour = theme_main_presence_attrs(resource_presence);
win_vprint(window, '-', 0, NULL, NO_EOL, presence_colour, "", " %s (%d), %s", resource->name, resource->priority, resource_presence);
win_printf(window, '-', 0, NULL, NO_EOL, presence_colour, "", " %s (%d), %s", resource->name, resource->priority, resource_presence);
if (resource->status) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", resource->status);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", resource->status);
}
win_newline(window);
@@ -917,19 +917,19 @@ win_show_info(ProfWin *window, PContact contact)
if (caps->software_version) {
SoftwareVersion *software_version = caps->software_version;
if (software_version->software) {
win_vprint(window, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", software_version->software);
win_printf(window, '-', 0, NULL, NO_EOL, 0, "", " Software: %s", software_version->software);
}
if (software_version->software_version) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->software_version);
}
if (software_version->software || software_version->software_version) {
win_newline(window);
}
if (software_version->os) {
win_vprint(window, '-', 0, NULL, NO_EOL, 0, "", " OS: %s", software_version->os);
win_printf(window, '-', 0, NULL, NO_EOL, 0, "", " OS: %s", software_version->os);
}
if (software_version->os_version) {
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ", %s", software_version->os_version);
}
if (software_version->os || software_version->os_version) {
win_newline(window);
@@ -961,12 +961,12 @@ win_show_status_string(ProfWin *window, const char *const from,
}
win_vprint(window, '-', 0, NULL, NO_EOL, presence_colour, "", "%s %s", pre, from);
win_printf(window, '-', 0, NULL, NO_EOL, presence_colour, "", "%s %s", pre, from);
if (show)
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", show);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", show);
else
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", default_show);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", default_show);
if (last_activity) {
gchar *date_fmt = NULL;
@@ -975,13 +975,13 @@ win_show_status_string(ProfWin *window, const char *const from,
prefs_free_string(time_pref);
assert(date_fmt != NULL);
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", last activity: %s", date_fmt);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", last activity: %s", date_fmt);
g_free(date_fmt);
}
if (status)
win_vprint(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", status);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", status);
win_print(window, '-', 0, NULL, NO_DATE, presence_colour, "", "");
@@ -1013,7 +1013,7 @@ win_print_incoming_message(ProfWin *window, GDateTime *timestamp,
}
void
win_vprint(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp,
win_printf(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp,
int flags, theme_item_t theme_item, const char *const from, const char *const message, ...)
{
va_list arg;