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

Added win_save_newline

Browse Source
This commit is contained in:
James Booth
2014-07-20 23:57:31 +01:00
parent 490e252fb4
commit f4fa0bc2dd
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/window.c
View File

@@ -219,7 +219,7 @@ win_show_info(ProfWin *window, PContact contact)
if (resource->status != NULL) {
win_save_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", resource->status);
}
win_save_print(window, '-', NULL, NO_DATE, 0, "", "");
win_save_newline(window);
if (resource->caps_str != NULL) {
Capabilities *caps = caps_get(resource->caps_str);
@@ -242,7 +242,7 @@ win_show_info(ProfWin *window, PContact contact)
if (caps->category != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
}
win_save_print(window, '-', NULL, NO_DATE, 0, "", "");
win_save_newline(window);
}
if (caps->software != NULL) {
win_save_vprint(window, '-', NULL, NO_EOL, 0, "", " Software: %s", caps->software);
@@ -251,7 +251,7 @@ win_show_info(ProfWin *window, PContact contact)
win_save_vprint(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version);
}
if ((caps->software != NULL) || (caps->software_version != NULL)) {
win_save_print(window, '-', NULL, NO_DATE, 0, "", "");
win_save_newline(window);
}
if (caps->os != NULL) {
win_save_vprint(window, '-', NULL, NO_EOL, 0, "", " OS: %s", caps->os);
@@ -260,7 +260,7 @@ win_show_info(ProfWin *window, PContact contact)
win_save_vprint(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version);
}
if ((caps->os != NULL) || (caps->os_version != NULL)) {
win_save_print(window, '-', NULL, NO_DATE, 0, "", "");
win_save_newline(window);
}
}
}
@@ -366,6 +366,12 @@ win_save_print(ProfWin *window, const char show_char, GTimeVal *tstamp,
g_free(date_fmt);
}
void
win_save_newline(ProfWin *window)
{
win_save_print(window, '-', NULL, NO_DATE, 0, "", "");
}
static void
_win_print(ProfWin *window, const char show_char, const char * const date_fmt,
int flags, int attrs, const char * const from, const char * const message)