aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Renamed win_save_print -> win_print

Browse Source
This commit is contained in:
James Booth 2015-03-14 14:12:32 +00:00
parent f4441ec64f
commit e02dbe24da
6 changed files with 187 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/commands.c
View File

@ -2511,7 +2511,7 @@ cmd_subject(gchar **args, struct cmd_help_t help)
win_vprint(window, '!', NULL, NO_EOL, THEME_ROOMINFO, "", "Room subject: "); win_vprint(window, '!', NULL, NO_EOL, THEME_ROOMINFO, "", "Room subject: ");
win_vprint(window, '!', NULL, NO_DATE, 0, "", "%s", subject); win_vprint(window, '!', NULL, NO_DATE, 0, "", "%s", subject);
} else { } else {
win_save_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Room has no subject"); win_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Room has no subject");
} }
return TRUE; return TRUE;
} }
@ -2576,7 +2576,7 @@ cmd_affiliation(gchar **args, struct cmd_help_t help)
iq_room_affiliation_list(mucwin->roomjid, "member"); iq_room_affiliation_list(mucwin->roomjid, "member");
iq_room_affiliation_list(mucwin->roomjid, "outcast"); iq_room_affiliation_list(mucwin->roomjid, "outcast");
} else if (g_strcmp0(affiliation, "none") == 0) { } else if (g_strcmp0(affiliation, "none") == 0) {
win_save_print((ProfWin*) mucwin, '!', NULL, 0, 0, "", "Cannot list users with no affiliation."); win_print((ProfWin*) mucwin, '!', NULL, 0, 0, "", "Cannot list users with no affiliation.");
} else { } else {
iq_room_affiliation_list(mucwin->roomjid, affiliation); iq_room_affiliation_list(mucwin->roomjid, affiliation);
} }
@ -2644,7 +2644,7 @@ cmd_role(gchar **args, struct cmd_help_t help)
iq_room_role_list(mucwin->roomjid, "participant"); iq_room_role_list(mucwin->roomjid, "participant");
iq_room_role_list(mucwin->roomjid, "visitor"); iq_room_role_list(mucwin->roomjid, "visitor");
} else if (g_strcmp0(role, "none") == 0) { } else if (g_strcmp0(role, "none") == 0) {
win_save_print((ProfWin*) mucwin, '!', NULL, 0, 0, "", "Cannot list users with no role."); win_print((ProfWin*) mucwin, '!', NULL, 0, 0, "", "Cannot list users with no role.");
} else { } else {
iq_room_role_list(mucwin->roomjid, role); iq_room_role_list(mucwin->roomjid, role);
} }
@ -2707,12 +2707,12 @@ cmd_room(gchar **args, struct cmd_help_t help)
if (g_strcmp0(args[0], "accept") == 0) { if (g_strcmp0(args[0], "accept") == 0) {
gboolean requires_config = muc_requires_config(mucwin->roomjid); gboolean requires_config = muc_requires_config(mucwin->roomjid);
if (!requires_config) { if (!requires_config) {
win_save_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Current room does not require configuration."); win_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Current room does not require configuration.");
return TRUE; return TRUE;
} else { } else {
iq_confirm_instant_room(mucwin->roomjid); iq_confirm_instant_room(mucwin->roomjid);
muc_set_requires_config(mucwin->roomjid, FALSE); muc_set_requires_config(mucwin->roomjid, FALSE);
win_save_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Room unlocked."); win_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Room unlocked.");
return TRUE; return TRUE;
} }
} }

92
src/ui/console.c
View File

@ -67,14 +67,14 @@ void
cons_show_time(void) cons_show_time(void)
{ {
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
win_save_print(console, '-', NULL, NO_EOL, 0, "", ""); win_print(console, '-', NULL, NO_EOL, 0, "", "");
} }
void void
cons_show_word(const char * const word) cons_show_word(const char * const word)
{ {
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", word); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", word);
} }
void void
@ -113,7 +113,7 @@ cons_show_error(const char * const msg, ...)
va_start(arg, msg); va_start(arg, msg);
GString *fmt_msg = g_string_new(NULL); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg); g_string_vprintf(fmt_msg, msg, arg);
win_save_print(console, '-', NULL, 0, THEME_ERROR, "", fmt_msg->str); win_print(console, '-', NULL, 0, THEME_ERROR, "", fmt_msg->str);
g_string_free(fmt_msg, TRUE); g_string_free(fmt_msg, TRUE);
va_end(arg); va_end(arg);
@ -234,7 +234,7 @@ cons_show_login_success(ProfAccount *account)
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", "%s", presence_str); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", "%s", presence_str);
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " (priority %d)", win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " (priority %d)",
accounts_get_priority_for_presence_type(account->name, presence)); accounts_get_priority_for_presence_type(account->name, presence));
win_save_print(console, '-', NULL, NO_DATE, 0, "", "."); win_print(console, '-', NULL, NO_DATE, 0, "", ".");
cons_alert(); cons_alert();
} }
@ -295,25 +295,25 @@ cons_show_caps(const char * const fulljid, resource_presence_t presence)
theme_item_t presence_colour = theme_main_presence_attrs(resource_presence); theme_item_t presence_colour = theme_main_presence_attrs(resource_presence);
win_vprint(console, '-', NULL, NO_EOL, presence_colour, "", "%s", fulljid); win_vprint(console, '-', NULL, NO_EOL, presence_colour, "", "%s", fulljid);
win_save_print(console, '-', NULL, NO_DATE, 0, "", ":"); win_print(console, '-', NULL, NO_DATE, 0, "", ":");
// show identity // show identity
if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) { if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
win_save_print(console, '-', NULL, NO_EOL, 0, "", "Identity: "); win_print(console, '-', NULL, NO_EOL, 0, "", "Identity: ");
if (caps->name != NULL) { if (caps->name != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->name);
if ((caps->category != NULL) || (caps->type != NULL)) { if ((caps->category != NULL) || (caps->type != NULL)) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type != NULL) { if (caps->type != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->type);
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(console); win_save_newline(console);
} }
@ -362,7 +362,7 @@ cons_show_software_version(const char * const jid, const char * const presence,
cons_show(""); cons_show("");
theme_item_t presence_colour = theme_main_presence_attrs(presence); theme_item_t presence_colour = theme_main_presence_attrs(presence);
win_vprint(console, '-', NULL, NO_EOL, presence_colour, "", "%s", jid); win_vprint(console, '-', NULL, NO_EOL, presence_colour, "", "%s", jid);
win_save_print(console, '-', NULL, NO_DATE, 0, "", ":"); win_print(console, '-', NULL, NO_DATE, 0, "", ":");
} }
if (name != NULL) { if (name != NULL) {
cons_show("Name : %s", name); cons_show("Name : %s", name);
@ -465,10 +465,10 @@ cons_show_bookmarks(const GList *list)
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", "/%s", item->nick); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", "/%s", item->nick);
} }
if (item->autojoin) { if (item->autojoin) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (autojoin)"); win_print(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (autojoin)");
} }
if (item->password != NULL) { if (item->password != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (private)"); win_print(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (private)");
} }
if (muc_active(item->jid)) { if (muc_active(item->jid)) {
ProfWin *roomwin = (ProfWin*)wins_get_muc(item->jid); ProfWin *roomwin = (ProfWin*)wins_get_muc(item->jid);
@ -752,21 +752,21 @@ cons_show_account(ProfAccount *account)
if (caps != NULL) { if (caps != NULL) {
// show identity // show identity
if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) { if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
win_save_print(console, '-', NULL, NO_EOL, 0, "", " Identity: "); win_print(console, '-', NULL, NO_EOL, 0, "", " Identity: ");
if (caps->name != NULL) { if (caps->name != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->name);
if ((caps->category != NULL) || (caps->type != NULL)) { if ((caps->category != NULL) || (caps->type != NULL)) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type != NULL) { if (caps->type != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->type);
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(console); win_save_newline(console);
} }
@ -1551,22 +1551,22 @@ cons_theme_colours(void)
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
cons_show("Theme colours:"); cons_show("Theme colours:");
win_save_print(console, '-', NULL, NO_EOL, THEME_WHITE, "", " white "); win_print(console, '-', NULL, NO_EOL, THEME_WHITE, "", " white ");
win_save_print(console, '-', NULL, NO_DATE, THEME_WHITE_BOLD, "", " bold_white"); win_print(console, '-', NULL, NO_DATE, THEME_WHITE_BOLD, "", " bold_white");
win_save_print(console, '-', NULL, NO_EOL, THEME_GREEN, "", " green "); win_print(console, '-', NULL, NO_EOL, THEME_GREEN, "", " green ");
win_save_print(console, '-', NULL, NO_DATE, THEME_GREEN_BOLD, "", " bold_green"); win_print(console, '-', NULL, NO_DATE, THEME_GREEN_BOLD, "", " bold_green");
win_save_print(console, '-', NULL, NO_EOL, THEME_RED, "", " red "); win_print(console, '-', NULL, NO_EOL, THEME_RED, "", " red ");
win_save_print(console, '-', NULL, NO_DATE, THEME_RED_BOLD, "", " bold_red"); win_print(console, '-', NULL, NO_DATE, THEME_RED_BOLD, "", " bold_red");
win_save_print(console, '-', NULL, NO_EOL, THEME_YELLOW, "", " yellow "); win_print(console, '-', NULL, NO_EOL, THEME_YELLOW, "", " yellow ");
win_save_print(console, '-', NULL, NO_DATE, THEME_YELLOW_BOLD, "", " bold_yellow"); win_print(console, '-', NULL, NO_DATE, THEME_YELLOW_BOLD, "", " bold_yellow");
win_save_print(console, '-', NULL, NO_EOL, THEME_BLUE, "", " blue "); win_print(console, '-', NULL, NO_EOL, THEME_BLUE, "", " blue ");
win_save_print(console, '-', NULL, NO_DATE, THEME_BLUE_BOLD, "", " bold_blue"); win_print(console, '-', NULL, NO_DATE, THEME_BLUE_BOLD, "", " bold_blue");
win_save_print(console, '-', NULL, NO_EOL, THEME_CYAN, "", " cyan "); win_print(console, '-', NULL, NO_EOL, THEME_CYAN, "", " cyan ");
win_save_print(console, '-', NULL, NO_DATE, THEME_CYAN_BOLD, "", " bold_cyan"); win_print(console, '-', NULL, NO_DATE, THEME_CYAN_BOLD, "", " bold_cyan");
win_save_print(console, '-', NULL, NO_EOL, THEME_MAGENTA, "", " magenta "); win_print(console, '-', NULL, NO_EOL, THEME_MAGENTA, "", " magenta ");
win_save_print(console, '-', NULL, NO_DATE, THEME_MAGENTA_BOLD, "", " bold_magenta"); win_print(console, '-', NULL, NO_DATE, THEME_MAGENTA_BOLD, "", " bold_magenta");
win_save_print(console, '-', NULL, NO_EOL, THEME_BLACK, "", " black "); win_print(console, '-', NULL, NO_EOL, THEME_BLACK, "", " black ");
win_save_print(console, '-', NULL, NO_DATE, THEME_BLACK_BOLD, "", " bold_black"); win_print(console, '-', NULL, NO_DATE, THEME_BLACK_BOLD, "", " bold_black");
cons_show(""); cons_show("");
} }
@ -1576,14 +1576,14 @@ _cons_splash_logo(void)
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
win_save_println(console, "Welcome to"); win_save_println(console, "Welcome to");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", " ___ _ "); win_print(console, '-', NULL, 0, THEME_SPLASH, "", " ___ _ ");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", " / __) (_)_ "); win_print(console, '-', NULL, 0, THEME_SPLASH, "", " / __) (_)_ ");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", " ____ ____ ___ | |__ ____ ____ _| |_ _ _ "); win_print(console, '-', NULL, 0, THEME_SPLASH, "", " ____ ____ ___ | |__ ____ ____ _| |_ _ _ ");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", "| _ \\ / ___) _ \\| __) _ | _ \\| | _) | | |"); win_print(console, '-', NULL, 0, THEME_SPLASH, "", "| _ \\ / ___) _ \\| __) _ | _ \\| | _) | | |");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", "| | | | | | |_| | | ( ( | | | | | | |_| |_| |"); win_print(console, '-', NULL, 0, THEME_SPLASH, "", "| | | | | | |_| | | ( ( | | | | | | |_| |_| |");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", "| ||_/|_| \\___/|_| \\_||_|_| |_|_|\\___)__ |"); win_print(console, '-', NULL, 0, THEME_SPLASH, "", "| ||_/|_| \\___/|_| \\_||_|_| |_|_|\\___)__ |");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", "|_| (____/ "); win_print(console, '-', NULL, 0, THEME_SPLASH, "", "|_| (____/ ");
win_save_print(console, '-', NULL, 0, THEME_SPLASH, "", ""); win_print(console, '-', NULL, 0, THEME_SPLASH, "", "");
if (strcmp(PACKAGE_STATUS, "development") == 0) { if (strcmp(PACKAGE_STATUS, "development") == 0) {
#ifdef HAVE_GIT_VERSION #ifdef HAVE_GIT_VERSION
@ -1623,7 +1623,7 @@ _show_roster_contacts(GSList *list, gboolean show_groups)
g_string_free(title, TRUE); g_string_free(title, TRUE);
win_save_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " - "); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", " - ");
GString *sub = g_string_new(""); GString *sub = g_string_new("");
sub = g_string_append(sub, p_contact_subscription(contact)); sub = g_string_append(sub, p_contact_subscription(contact));
if (p_contact_pending_out(contact)) { if (p_contact_pending_out(contact)) {
@ -1660,7 +1660,7 @@ _show_roster_contacts(GSList *list, gboolean show_groups)
win_vprint(console, '-', NULL, NO_DATE, 0, "", "%s", groups_str->str); win_vprint(console, '-', NULL, NO_DATE, 0, "", "%s", groups_str->str);
g_string_free(groups_str, TRUE); g_string_free(groups_str, TRUE);
} else { } else {
win_save_print(console, '-', NULL, NO_DATE, 0, "", " "); win_print(console, '-', NULL, NO_DATE, 0, "", " ");
} }
} }

210
src/ui/core.c
View File

@ -307,13 +307,13 @@ ui_handle_stanza(const char * const msg)
ProfWin *window = (ProfWin*) xmlconsole; ProfWin *window = (ProfWin*) xmlconsole;
if (g_str_has_prefix(msg, "SENT:")) { if (g_str_has_prefix(msg, "SENT:")) {
win_save_print(window, '-', NULL, 0, 0, "", "SENT:"); win_print(window, '-', NULL, 0, 0, "", "SENT:");
win_save_print(window, '-', NULL, 0, THEME_ONLINE, "", &msg[6]); win_print(window, '-', NULL, 0, THEME_ONLINE, "", &msg[6]);
win_save_print(window, '-', NULL, 0, THEME_ONLINE, "", ""); win_print(window, '-', NULL, 0, THEME_ONLINE, "", "");
} else if (g_str_has_prefix(msg, "RECV:")) { } else if (g_str_has_prefix(msg, "RECV:")) {
win_save_print(window, '-', NULL, 0, 0, "", "RECV:"); win_print(window, '-', NULL, 0, 0, "", "RECV:");
win_save_print(window, '-', NULL, 0, THEME_AWAY, "", &msg[6]); win_print(window, '-', NULL, 0, THEME_AWAY, "", &msg[6]);
win_save_print(window, '-', NULL, 0, THEME_AWAY, "", ""); win_print(window, '-', NULL, 0, THEME_AWAY, "", "");
} }
} }
} }
@ -992,9 +992,9 @@ ui_gone_secure(const char * const barejid, gboolean trusted)
chatwin->is_otr = TRUE; chatwin->is_otr = TRUE;
chatwin->is_trusted = trusted; chatwin->is_trusted = trusted;
if (trusted) { if (trusted) {
win_save_print(window, '!', NULL, 0, THEME_OTR_STARTED_TRUSTED, "", "OTR session started (trusted)."); win_print(window, '!', NULL, 0, THEME_OTR_STARTED_TRUSTED, "", "OTR session started (trusted).");
} else { } else {
win_save_print(window, '!', NULL, 0, THEME_OTR_STARTED_UNTRUSTED, "", "OTR session started (untrusted)."); win_print(window, '!', NULL, 0, THEME_OTR_STARTED_UNTRUSTED, "", "OTR session started (untrusted).");
} }
if (wins_is_current(window)) { if (wins_is_current(window)) {
@ -1021,7 +1021,7 @@ ui_gone_insecure(const char * const barejid)
chatwin->is_trusted = FALSE; chatwin->is_trusted = FALSE;
ProfWin *window = (ProfWin*)chatwin; ProfWin *window = (ProfWin*)chatwin;
win_save_print(window, '!', NULL, 0, THEME_OTR_ENDED, "", "OTR session ended."); win_print(window, '!', NULL, 0, THEME_OTR_ENDED, "", "OTR session ended.");
if (wins_is_current(window)) { if (wins_is_current(window)) {
title_bar_switch(); title_bar_switch();
} }
@ -1044,7 +1044,7 @@ ui_smp_recipient_initiated_q(const char * const barejid, const char *question)
if (chatwin) { if (chatwin) {
win_vprint((ProfWin*)chatwin, '!', NULL, 0, 0, "", "%s wants to authenticate your identity with the following question:", barejid); win_vprint((ProfWin*)chatwin, '!', NULL, 0, 0, "", "%s wants to authenticate your identity with the following question:", barejid);
win_vprint((ProfWin*)chatwin, '!', NULL, 0, 0, "", " %s", question); win_vprint((ProfWin*)chatwin, '!', NULL, 0, 0, "", " %s", question);
win_save_print((ProfWin*)chatwin, '!', NULL, 0, 0, "", "use '/otr answer <answer>'."); win_print((ProfWin*)chatwin, '!', NULL, 0, 0, "", "use '/otr answer <answer>'.");
} }
} }
@ -1071,7 +1071,7 @@ ui_smp_aborted(const char * const barejid)
{ {
ProfChatWin *chatwin = wins_get_chat(barejid); ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) { if (chatwin) {
win_save_print((ProfWin*)chatwin, '!', NULL, 0, 0, "", "SMP session aborted."); win_print((ProfWin*)chatwin, '!', NULL, 0, 0, "", "SMP session aborted.");
} }
} }
@ -1080,7 +1080,7 @@ ui_smp_successful(const char * const barejid)
{ {
ProfChatWin *chatwin = wins_get_chat(barejid); ProfChatWin *chatwin = wins_get_chat(barejid);
if (chatwin) { if (chatwin) {
win_save_print((ProfWin*)chatwin, '!', NULL, 0, 0, "", "Authentication successful."); win_print((ProfWin*)chatwin, '!', NULL, 0, 0, "", "Authentication successful.");
} }
} }
@ -1129,7 +1129,7 @@ ui_trust(const char * const barejid)
chatwin->is_trusted = TRUE; chatwin->is_trusted = TRUE;
ProfWin *window = (ProfWin*)chatwin; ProfWin *window = (ProfWin*)chatwin;
win_save_print(window, '!', NULL, 0, THEME_OTR_TRUSTED, "", "OTR session trusted."); win_print(window, '!', NULL, 0, THEME_OTR_TRUSTED, "", "OTR session trusted.");
if (wins_is_current(window)) { if (wins_is_current(window)) {
title_bar_switch(); title_bar_switch();
} }
@ -1145,7 +1145,7 @@ ui_untrust(const char * const barejid)
chatwin->is_trusted = FALSE; chatwin->is_trusted = FALSE;
ProfWin *window = (ProfWin*)chatwin; ProfWin *window = (ProfWin*)chatwin;
win_save_print(window, '!', NULL, 0, THEME_OTR_UNTRUSTED, "", "OTR session untrusted."); win_print(window, '!', NULL, 0, THEME_OTR_UNTRUSTED, "", "OTR session untrusted.");
if (wins_is_current(window)) { if (wins_is_current(window)) {
title_bar_switch(); title_bar_switch();
} }
@ -1286,7 +1286,7 @@ ui_current_print_formatted_line(const char show_char, int attrs, const char * co
va_start(arg, msg); va_start(arg, msg);
GString *fmt_msg = g_string_new(NULL); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg); g_string_vprintf(fmt_msg, msg, arg);
win_save_print(current, show_char, NULL, 0, attrs, "", fmt_msg->str); win_print(current, show_char, NULL, 0, attrs, "", fmt_msg->str);
va_end(arg); va_end(arg);
g_string_free(fmt_msg, TRUE); g_string_free(fmt_msg, TRUE);
} }
@ -1295,7 +1295,7 @@ void
ui_current_error_line(const char * const msg) ui_current_error_line(const char * const msg)
{ {
ProfWin *current = wins_get_current(); ProfWin *current = wins_get_current();
win_save_print(current, '-', NULL, 0, THEME_ERROR, "", msg); win_print(current, '-', NULL, 0, THEME_ERROR, "", msg);
} }
void void
@ -1464,11 +1464,11 @@ ui_outgoing_chat_msg(const char * const from, const char * const barejid,
GString *message_with_id = g_string_new(id); GString *message_with_id = g_string_new(id);
g_string_append(message_with_id, ": "); g_string_append(message_with_id, ": ");
g_string_append(message_with_id, message); g_string_append(message_with_id, message);
win_save_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message_with_id->str); win_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message_with_id->str);
g_string_free(message_with_id, TRUE); g_string_free(message_with_id, TRUE);
free(id); free(id);
} else { } else {
win_save_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message); win_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message);
} }
ui_switch_win(num); ui_switch_win(num);
} }
@ -1490,7 +1490,7 @@ ui_outgoing_private_msg(const char * const from, const char * const fulljid,
num = wins_get_num(window); num = wins_get_num(window);
} }
win_save_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message); win_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message);
ui_switch_win(num); ui_switch_win(num);
} }
@ -1517,7 +1517,7 @@ ui_room_join(const char * const roomjid, gboolean focus)
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", affiliation: %s", affiliation); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", affiliation: %s", affiliation);
} }
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
num = wins_get_num(window); num = wins_get_num(window);
@ -1552,7 +1552,7 @@ ui_room_role_change(const char * const roomjid, const char * const role, const c
if (reason) { if (reason) {
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason);
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
} }
void void
@ -1567,7 +1567,7 @@ ui_room_affiliation_change(const char * const roomjid, const char * const affili
if (reason) { if (reason) {
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason);
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
} }
void void
@ -1582,7 +1582,7 @@ ui_room_role_and_affiliation_change(const char * const roomjid, const char * con
if (reason) { if (reason) {
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason);
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
} }
@ -1598,7 +1598,7 @@ ui_room_occupant_role_change(const char * const roomjid, const char * const nick
if (reason) { if (reason) {
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason);
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
} }
void void
@ -1613,7 +1613,7 @@ ui_room_occupant_affiliation_change(const char * const roomjid, const char * con
if (reason) { if (reason) {
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason);
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
} }
void void
@ -1628,7 +1628,7 @@ ui_room_occupant_role_and_affiliation_change(const char * const roomjid, const c
if (reason) { if (reason) {
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ROOMINFO, "", ", reason: %s", reason);
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
} }
void void
@ -1637,7 +1637,7 @@ ui_handle_room_info_error(const char * const roomjid, const char * const error)
ProfWin *window = (ProfWin*)wins_get_muc(roomjid); ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
if (window) { if (window) {
win_vprint(window, '!', NULL, 0, 0, "", "Room info request failed: %s", error); win_vprint(window, '!', NULL, 0, 0, "", "Room info request failed: %s", error);
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
} }
@ -1649,7 +1649,7 @@ ui_show_room_disco_info(const char * const roomjid, GSList *identities, GSList *
if (((identities != NULL) && (g_slist_length(identities) > 0)) || if (((identities != NULL) && (g_slist_length(identities) > 0)) ||
((features != NULL) && (g_slist_length(features) > 0))) { ((features != NULL) && (g_slist_length(features) > 0))) {
if (identities != NULL) { if (identities != NULL) {
win_save_print(window, '!', NULL, 0, 0, "", "Identities:"); win_print(window, '!', NULL, 0, 0, "", "Identities:");
} }
while (identities != NULL) { while (identities != NULL) {
DiscoIdentity *identity = identities->data; // anme trpe, cat DiscoIdentity *identity = identities->data; // anme trpe, cat
@ -1665,19 +1665,19 @@ ui_show_room_disco_info(const char * const roomjid, GSList *identities, GSList *
if (identity->category != NULL) { if (identity->category != NULL) {
identity_str = g_string_append(identity_str, identity->category); identity_str = g_string_append(identity_str, identity->category);
} }
win_save_print(window, '!', NULL, 0, 0, "", identity_str->str); win_print(window, '!', NULL, 0, 0, "", identity_str->str);
g_string_free(identity_str, TRUE); g_string_free(identity_str, TRUE);
identities = g_slist_next(identities); identities = g_slist_next(identities);
} }
if (features != NULL) { if (features != NULL) {
win_save_print(window, '!', NULL, 0, 0, "", "Features:"); win_print(window, '!', NULL, 0, 0, "", "Features:");
} }
while (features != NULL) { while (features != NULL) {
win_vprint(window, '!', NULL, 0, 0, "", " %s", features->data); win_vprint(window, '!', NULL, 0, 0, "", " %s", features->data);
features = g_slist_next(features); features = g_slist_next(features);
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
} }
} }
@ -1691,7 +1691,7 @@ ui_room_roster(const char * const roomjid, GList *roster, const char * const pre
} else { } else {
if ((roster == NULL) || (g_list_length(roster) == 0)) { if ((roster == NULL) || (g_list_length(roster) == 0)) {
if (presence == NULL) { if (presence == NULL) {
win_save_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Room is empty."); win_print(window, '!', NULL, 0, THEME_ROOMINFO, "", "Room is empty.");
} else { } else {
win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "", "No occupants %s.", presence); win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "", "No occupants %s.", presence);
} }
@ -1711,12 +1711,12 @@ ui_room_roster(const char * const roomjid, GList *roster, const char * const pre
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, presence_colour, "", "%s", occupant->nick); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, presence_colour, "", "%s", occupant->nick);
if (roster->next != NULL) { if (roster->next != NULL) {
win_save_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", ", "); win_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", ", ");
} }
roster = g_list_next(roster); roster = g_list_next(roster);
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ONLINE, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ONLINE, "", "");
} }
} }
@ -1804,7 +1804,7 @@ ui_room_member_online(const char * const roomjid, const char * const nick, const
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", ", affiliation: %s", affiliation); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", ", affiliation: %s", affiliation);
} }
} }
win_save_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", ""); win_print(window, '!', NULL, NO_DATE, THEME_ROOMINFO, "", "");
} }
} }
@ -1864,7 +1864,7 @@ ui_room_history(const char * const roomjid, const char * const nick,
g_string_append(line, message); g_string_append(line, message);
} }
win_save_print(window, '-', &tv_stamp, NO_COLOUR_DATE, 0, "", line->str); win_print(window, '-', &tv_stamp, NO_COLOUR_DATE, 0, "", line->str);
g_string_free(line, TRUE); g_string_free(line, TRUE);
} }
} }
@ -1883,12 +1883,12 @@ ui_room_message(const char * const roomjid, const char * const nick,
if (g_strcmp0(nick, my_nick) != 0) { if (g_strcmp0(nick, my_nick) != 0) {
if (g_strrstr(message, my_nick) != NULL) { if (g_strrstr(message, my_nick) != NULL) {
win_save_print(window, '-', NULL, NO_ME, THEME_ROOMMENTION, nick, message); win_print(window, '-', NULL, NO_ME, THEME_ROOMMENTION, nick, message);
} else { } else {
win_save_print(window, '-', NULL, NO_ME, THEME_TEXT_THEM, nick, message); win_print(window, '-', NULL, NO_ME, THEME_TEXT_THEM, nick, message);
} }
} else { } else {
win_save_print(window, '-', NULL, 0, THEME_TEXT_ME, nick, message); win_print(window, '-', NULL, 0, THEME_TEXT_ME, nick, message);
} }
// currently in groupchat window // currently in groupchat window
@ -1964,7 +1964,7 @@ ui_room_requires_config(const char * const roomjid)
ui_index = 0; ui_index = 0;
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "", win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "",
"Room locked, requires configuration."); "Room locked, requires configuration.");
win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "", win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "",
@ -1973,7 +1973,7 @@ ui_room_requires_config(const char * const roomjid)
"Use '/room destroy' to cancel and destroy the room"); "Use '/room destroy' to cancel and destroy the room");
win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "", win_vprint(window, '!', NULL, 0, THEME_ROOMINFO, "",
"Use '/room config' to edit the room configuration"); "Use '/room config' to edit the room configuration");
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
// currently in groupchat window // currently in groupchat window
if (wins_is_current(window)) { if (wins_is_current(window)) {
@ -2184,10 +2184,10 @@ ui_handle_room_affiliation_list(const char * const roomjid, const char * const a
win_vprint(window, '!', NULL, 0, 0, "", " %s", jid); win_vprint(window, '!', NULL, 0, 0, "", " %s", jid);
curr_jid = g_slist_next(curr_jid); curr_jid = g_slist_next(curr_jid);
} }
win_save_print(window, '!', NULL, 0, 0, "", ""); win_print(window, '!', NULL, 0, 0, "", "");
} else { } else {
win_vprint(window, '!', NULL, 0, 0, "", "No users found with affiliation: %s", affiliation); win_vprint(window, '!', NULL, 0, 0, "", "No users found with affiliation: %s", affiliation);
win_save_print(window, '!', NULL, 0, 0, "", ""); win_print(window, '!', NULL, 0, 0, "", "");
} }
} }
} }
@ -2223,10 +2223,10 @@ ui_handle_room_role_list(const char * const roomjid, const char * const role, GS
} }
curr_nick = g_slist_next(curr_nick); curr_nick = g_slist_next(curr_nick);
} }
win_save_print(window, '!', NULL, 0, 0, "", ""); win_print(window, '!', NULL, 0, 0, "", "");
} else { } else {
win_vprint(window, '!', NULL, 0, 0, "", "No occupants found with role: %s", role); win_vprint(window, '!', NULL, 0, 0, "", "No occupants found with role: %s", role);
win_save_print(window, '!', NULL, 0, 0, "", ""); win_print(window, '!', NULL, 0, 0, "", "");
} }
} }
} }
@ -2413,7 +2413,7 @@ ui_show_room_info(ProfMucWin *mucwin)
win_vprint(window, '!', NULL, 0, 0, "", "Room: %s", mucwin->roomjid); win_vprint(window, '!', NULL, 0, 0, "", "Room: %s", mucwin->roomjid);
win_vprint(window, '!', NULL, 0, 0, "", "Affiliation: %s", affiliation); win_vprint(window, '!', NULL, 0, 0, "", "Affiliation: %s", affiliation);
win_vprint(window, '!', NULL, 0, 0, "", "Role: %s", role); win_vprint(window, '!', NULL, 0, 0, "", "Role: %s", role);
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
void void
@ -2425,28 +2425,28 @@ ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role)
if (!occupants) { if (!occupants) {
switch (role) { switch (role) {
case MUC_ROLE_MODERATOR: case MUC_ROLE_MODERATOR:
win_save_print(window, '!', NULL, 0, 0, "", "No moderators found."); win_print(window, '!', NULL, 0, 0, "", "No moderators found.");
break; break;
case MUC_ROLE_PARTICIPANT: case MUC_ROLE_PARTICIPANT:
win_save_print(window, '!', NULL, 0, 0, "", "No participants found."); win_print(window, '!', NULL, 0, 0, "", "No participants found.");
break; break;
case MUC_ROLE_VISITOR: case MUC_ROLE_VISITOR:
win_save_print(window, '!', NULL, 0, 0, "", "No visitors found."); win_print(window, '!', NULL, 0, 0, "", "No visitors found.");
break; break;
default: default:
break; break;
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} else { } else {
switch (role) { switch (role) {
case MUC_ROLE_MODERATOR: case MUC_ROLE_MODERATOR:
win_save_print(window, '!', NULL, 0, 0, "", "Moderators:"); win_print(window, '!', NULL, 0, 0, "", "Moderators:");
break; break;
case MUC_ROLE_PARTICIPANT: case MUC_ROLE_PARTICIPANT:
win_save_print(window, '!', NULL, 0, 0, "", "Participants:"); win_print(window, '!', NULL, 0, 0, "", "Participants:");
break; break;
case MUC_ROLE_VISITOR: case MUC_ROLE_VISITOR:
win_save_print(window, '!', NULL, 0, 0, "", "Visitors:"); win_print(window, '!', NULL, 0, 0, "", "Visitors:");
break; break;
default: default:
break; break;
@ -2466,7 +2466,7 @@ ui_show_room_role_list(ProfMucWin *mucwin, muc_role_t role)
curr_occupant = g_slist_next(curr_occupant); curr_occupant = g_slist_next(curr_occupant);
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
} }
@ -2479,34 +2479,34 @@ ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation)
if (!occupants) { if (!occupants) {
switch (affiliation) { switch (affiliation) {
case MUC_AFFILIATION_OWNER: case MUC_AFFILIATION_OWNER:
win_save_print(window, '!', NULL, 0, 0, "", "No owners found."); win_print(window, '!', NULL, 0, 0, "", "No owners found.");
break; break;
case MUC_AFFILIATION_ADMIN: case MUC_AFFILIATION_ADMIN:
win_save_print(window, '!', NULL, 0, 0, "", "No admins found."); win_print(window, '!', NULL, 0, 0, "", "No admins found.");
break; break;
case MUC_AFFILIATION_MEMBER: case MUC_AFFILIATION_MEMBER:
win_save_print(window, '!', NULL, 0, 0, "", "No members found."); win_print(window, '!', NULL, 0, 0, "", "No members found.");
break; break;
case MUC_AFFILIATION_OUTCAST: case MUC_AFFILIATION_OUTCAST:
win_save_print(window, '!', NULL, 0, 0, "", "No outcasts found."); win_print(window, '!', NULL, 0, 0, "", "No outcasts found.");
break; break;
default: default:
break; break;
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} else { } else {
switch (affiliation) { switch (affiliation) {
case MUC_AFFILIATION_OWNER: case MUC_AFFILIATION_OWNER:
win_save_print(window, '!', NULL, 0, 0, "", "Owners:"); win_print(window, '!', NULL, 0, 0, "", "Owners:");
break; break;
case MUC_AFFILIATION_ADMIN: case MUC_AFFILIATION_ADMIN:
win_save_print(window, '!', NULL, 0, 0, "", "Admins:"); win_print(window, '!', NULL, 0, 0, "", "Admins:");
break; break;
case MUC_AFFILIATION_MEMBER: case MUC_AFFILIATION_MEMBER:
win_save_print(window, '!', NULL, 0, 0, "", "Members:"); win_print(window, '!', NULL, 0, 0, "", "Members:");
break; break;
case MUC_AFFILIATION_OUTCAST: case MUC_AFFILIATION_OUTCAST:
win_save_print(window, '!', NULL, 0, 0, "", "Outcasts:"); win_print(window, '!', NULL, 0, 0, "", "Outcasts:");
break; break;
default: default:
break; break;
@ -2526,7 +2526,7 @@ ui_show_room_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation)
curr_occupant = g_slist_next(curr_occupant); curr_occupant = g_slist_next(curr_occupant);
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
} }
@ -2536,9 +2536,9 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
win_vprint(window, '-', NULL, NO_EOL, THEME_AWAY, "", "[%s] ", tag); win_vprint(window, '-', NULL, NO_EOL, THEME_AWAY, "", "[%s] ", tag);
win_vprint(window, '-', NULL, NO_EOL | NO_DATE, 0, "", "%s", field->label); win_vprint(window, '-', NULL, NO_EOL | NO_DATE, 0, "", "%s", field->label);
if (field->required) { if (field->required) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " (required): "); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " (required): ");
} else { } else {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ": "); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ": ");
} }
GSList *values = field->values; GSList *values = field->values;
@ -2552,9 +2552,9 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
char *value = curr_value->data; char *value = curr_value->data;
if (value != NULL) { if (value != NULL) {
if (g_strcmp0(field->var, "muc#roomconfig_roomsecret") == 0) { if (g_strcmp0(field->var, "muc#roomconfig_roomsecret") == 0) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]"); win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]");
} else { } else {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value); win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value);
} }
} }
} }
@ -2564,7 +2564,7 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
if (curr_value != NULL) { if (curr_value != NULL) {
char *value = curr_value->data; char *value = curr_value->data;
if (value != NULL) { if (value != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]"); win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]");
} }
} }
win_save_newline(window); win_save_newline(window);
@ -2583,16 +2583,16 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
break; break;
case FIELD_BOOLEAN: case FIELD_BOOLEAN:
if (curr_value == NULL) { if (curr_value == NULL) {
win_save_print(window, '-', NULL, NO_DATE, THEME_OFFLINE, "", "FALSE"); win_print(window, '-', NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
} else { } else {
char *value = curr_value->data; char *value = curr_value->data;
if (value == NULL) { if (value == NULL) {
win_save_print(window, '-', NULL, NO_DATE, THEME_OFFLINE, "", "FALSE"); win_print(window, '-', NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
} else { } else {
if (g_strcmp0(value, "0") == 0) { if (g_strcmp0(value, "0") == 0) {
win_save_print(window, '-', NULL, NO_DATE, THEME_OFFLINE, "", "FALSE"); win_print(window, '-', NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
} else { } else {
win_save_print(window, '-', NULL, NO_DATE, THEME_ONLINE, "", "TRUE"); win_print(window, '-', NULL, NO_DATE, THEME_ONLINE, "", "TRUE");
} }
} }
} }
@ -2634,7 +2634,7 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
if (curr_value != NULL) { if (curr_value != NULL) {
char *value = curr_value->data; char *value = curr_value->data;
if (value != NULL) { if (value != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value); win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value);
} }
} }
win_save_newline(window); win_save_newline(window);
@ -2651,7 +2651,7 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
if (curr_value != NULL) { if (curr_value != NULL) {
char *value = curr_value->data; char *value = curr_value->data;
if (value != NULL) { if (value != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", value); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", value);
} }
} }
win_save_newline(window); win_save_newline(window);
@ -2666,12 +2666,12 @@ ui_show_form(ProfMucConfWin *confwin)
{ {
ProfWin *window = (ProfWin*) confwin; ProfWin *window = (ProfWin*) confwin;
if (confwin->form->title != NULL) { if (confwin->form->title != NULL) {
win_save_print(window, '-', NULL, NO_EOL, 0, "", "Form title: "); win_print(window, '-', NULL, NO_EOL, 0, "", "Form title: ");
win_save_print(window, '-', NULL, NO_DATE, 0, "", confwin->form->title); win_print(window, '-', NULL, NO_DATE, 0, "", confwin->form->title);
} else { } else {
win_vprint(window, '-', NULL, 0, 0, "", "Configuration for room %s.", confwin->roomjid); win_vprint(window, '-', NULL, 0, 0, "", "Configuration for room %s.", confwin->roomjid);
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
ui_show_form_help(confwin); ui_show_form_help(confwin);
@ -2683,7 +2683,7 @@ ui_show_form(ProfMucConfWin *confwin)
if ((g_strcmp0(field->type, "fixed") == 0) && field->values) { if ((g_strcmp0(field->type, "fixed") == 0) && field->values) {
if (field->values) { if (field->values) {
char *value = field->values->data; char *value = field->values->data;
win_save_print(window, '-', NULL, 0, 0, "", value); win_print(window, '-', NULL, 0, 0, "", value);
} }
} else if (g_strcmp0(field->type, "hidden") != 0 && field->var) { } else if (g_strcmp0(field->type, "hidden") != 0 && field->var) {
char *tag = g_hash_table_lookup(confwin->form->var_to_tag, field->var); char *tag = g_hash_table_lookup(confwin->form->var_to_tag, field->var);
@ -2714,11 +2714,11 @@ ui_handle_room_configuration(const char * const roomjid, DataForm *form)
ui_show_form(confwin); ui_show_form(confwin);
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
win_save_print(window, '-', NULL, 0, 0, "", "Use '/form submit' to save changes."); win_print(window, '-', NULL, 0, 0, "", "Use '/form submit' to save changes.");
win_save_print(window, '-', NULL, 0, 0, "", "Use '/form cancel' to cancel changes."); win_print(window, '-', NULL, 0, 0, "", "Use '/form cancel' to cancel changes.");
win_save_print(window, '-', NULL, 0, 0, "", "See '/form help' for more information."); win_print(window, '-', NULL, 0, 0, "", "See '/form help' for more information.");
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
void void
@ -2740,7 +2740,7 @@ ui_handle_room_configuration_form_error(const char * const roomjid, const char *
g_string_append(message_str, message); g_string_append(message_str, message);
} }
win_save_print(window, '-', NULL, 0, THEME_ERROR, "", message_str->str); win_print(window, '-', NULL, 0, THEME_ERROR, "", message_str->str);
g_string_free(message_str, TRUE); g_string_free(message_str, TRUE);
} }
@ -2768,7 +2768,7 @@ ui_handle_room_config_submit_result(const char * const roomjid)
if (muc_window) { if (muc_window) {
int num = wins_get_num(muc_window); int num = wins_get_num(muc_window);
ui_switch_win(num); ui_switch_win(num);
win_save_print(muc_window, '!', NULL, 0, THEME_ROOMINFO, "", "Room configuration successful"); win_print(muc_window, '!', NULL, 0, THEME_ROOMINFO, "", "Room configuration successful");
} else { } else {
ui_switch_win(1); ui_switch_win(1);
cons_show("Room configuration successful: %s", roomjid); cons_show("Room configuration successful: %s", roomjid);
@ -2797,13 +2797,13 @@ ui_handle_room_config_submit_result_error(const char * const roomjid, const char
if (message) { if (message) {
win_vprint(form_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error: %s", message); win_vprint(form_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error: %s", message);
} else { } else {
win_save_print(form_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error"); win_print(form_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error");
} }
} else if (muc_window) { } else if (muc_window) {
if (message) { if (message) {
win_vprint(muc_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error: %s", message); win_vprint(muc_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error: %s", message);
} else { } else {
win_save_print(muc_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error"); win_print(muc_window, '!', NULL, 0, THEME_ERROR, "", "Configuration error");
} }
} else { } else {
if (message) { if (message) {
@ -2813,7 +2813,7 @@ ui_handle_room_config_submit_result_error(const char * const roomjid, const char
} }
} }
} else { } else {
win_save_print(console, '!', NULL, 0, THEME_ERROR, "", "Configuration error"); win_print(console, '!', NULL, 0, THEME_ERROR, "", "Configuration error");
} }
} }
@ -2823,11 +2823,11 @@ ui_show_form_field_help(ProfMucConfWin *confwin, char *tag)
ProfWin *window = (ProfWin*) confwin; ProfWin *window = (ProfWin*) confwin;
FormField *field = form_get_field_by_tag(confwin->form, tag); FormField *field = form_get_field_by_tag(confwin->form, tag);
if (field != NULL) { if (field != NULL) {
win_save_print(window, '-', NULL, NO_EOL, 0, "", field->label); win_print(window, '-', NULL, NO_EOL, 0, "", field->label);
if (field->required) { if (field->required) {
win_save_print(window, '-', NULL, NO_DATE, 0, "", " (Required):"); win_print(window, '-', NULL, NO_DATE, 0, "", " (Required):");
} else { } else {
win_save_print(window, '-', NULL, NO_DATE, 0, "", ":"); win_print(window, '-', NULL, NO_DATE, 0, "", ":");
} }
if (field->description != NULL) { if (field->description != NULL) {
win_vprint(window, '-', NULL, 0, 0, "", " Description : %s", field->description); win_vprint(window, '-', NULL, 0, 0, "", " Description : %s", field->description);
@ -2842,12 +2842,12 @@ ui_show_form_field_help(ProfMucConfWin *confwin, char *tag)
case FIELD_TEXT_SINGLE: case FIELD_TEXT_SINGLE:
case FIELD_TEXT_PRIVATE: case FIELD_TEXT_PRIVATE:
win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag);
win_save_print(window, '-', NULL, 0, 0, "", " Where : <value> is any text"); win_print(window, '-', NULL, 0, 0, "", " Where : <value> is any text");
break; break;
case FIELD_TEXT_MULTI: case FIELD_TEXT_MULTI:
num_values = form_get_value_count(confwin->form, tag); num_values = form_get_value_count(confwin->form, tag);
win_vprint(window, '-', NULL, 0, 0, "", " Add : /%s add <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Add : /%s add <value>", tag);
win_save_print(window, '-', NULL, 0, 0, "", " Where : <value> is any text"); win_print(window, '-', NULL, 0, 0, "", " Where : <value> is any text");
if (num_values > 0) { if (num_values > 0) {
win_vprint(window, '-', NULL, 0, 0, "", " Remove : /%s remove <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Remove : /%s remove <value>", tag);
win_vprint(window, '-', NULL, 0, 0, "", " Where : <value> between 'val1' and 'val%d'", num_values); win_vprint(window, '-', NULL, 0, 0, "", " Where : <value> between 'val1' and 'val%d'", num_values);
@ -2855,11 +2855,11 @@ ui_show_form_field_help(ProfMucConfWin *confwin, char *tag)
break; break;
case FIELD_BOOLEAN: case FIELD_BOOLEAN:
win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag);
win_save_print(window, '-', NULL, 0, 0, "", " Where : <value> is either 'on' or 'off'"); win_print(window, '-', NULL, 0, 0, "", " Where : <value> is either 'on' or 'off'");
break; break;
case FIELD_LIST_SINGLE: case FIELD_LIST_SINGLE:
win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag);
win_save_print(window, '-', NULL, 0, 0, "", " Where : <value> is one of"); win_print(window, '-', NULL, 0, 0, "", " Where : <value> is one of");
curr_option = field->options; curr_option = field->options;
while (curr_option != NULL) { while (curr_option != NULL) {
option = curr_option->data; option = curr_option->data;
@ -2870,7 +2870,7 @@ ui_show_form_field_help(ProfMucConfWin *confwin, char *tag)
case FIELD_LIST_MULTI: case FIELD_LIST_MULTI:
win_vprint(window, '-', NULL, 0, 0, "", " Add : /%s add <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Add : /%s add <value>", tag);
win_vprint(window, '-', NULL, 0, 0, "", " Remove : /%s remove <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Remove : /%s remove <value>", tag);
win_save_print(window, '-', NULL, 0, 0, "", " Where : <value> is one of"); win_print(window, '-', NULL, 0, 0, "", " Where : <value> is one of");
curr_option = field->options; curr_option = field->options;
while (curr_option != NULL) { while (curr_option != NULL) {
option = curr_option->data; option = curr_option->data;
@ -2880,12 +2880,12 @@ ui_show_form_field_help(ProfMucConfWin *confwin, char *tag)
break; break;
case FIELD_JID_SINGLE: case FIELD_JID_SINGLE:
win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Set : /%s <value>", tag);
win_save_print(window, '-', NULL, 0, 0, "", " Where : <value> is a valid Jabber ID"); win_print(window, '-', NULL, 0, 0, "", " Where : <value> is a valid Jabber ID");
break; break;
case FIELD_JID_MULTI: case FIELD_JID_MULTI:
win_vprint(window, '-', NULL, 0, 0, "", " Add : /%s add <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Add : /%s add <value>", tag);
win_vprint(window, '-', NULL, 0, 0, "", " Remove : /%s remove <value>", tag); win_vprint(window, '-', NULL, 0, 0, "", " Remove : /%s remove <value>", tag);
win_save_print(window, '-', NULL, 0, 0, "", " Where : <value> is a valid Jabber ID"); win_print(window, '-', NULL, 0, 0, "", " Where : <value> is a valid Jabber ID");
break; break;
case FIELD_FIXED: case FIELD_FIXED:
case FIELD_UNKNOWN: case FIELD_UNKNOWN:
@ -2903,9 +2903,9 @@ ui_show_form_help(ProfMucConfWin *confwin)
{ {
if (confwin->form->instructions != NULL) { if (confwin->form->instructions != NULL) {
ProfWin *window = (ProfWin*) confwin; ProfWin *window = (ProfWin*) confwin;
win_save_print(window, '-', NULL, 0, 0, "", "Supplied instructions:"); win_print(window, '-', NULL, 0, 0, "", "Supplied instructions:");
win_save_print(window, '-', NULL, 0, 0, "", confwin->form->instructions); win_print(window, '-', NULL, 0, 0, "", confwin->form->instructions);
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
} }
@ -2915,7 +2915,7 @@ ui_show_lines(ProfWin *window, const gchar** lines)
if (lines != NULL) { if (lines != NULL) {
int i; int i;
for (i = 0; lines[i] != NULL; i++) { for (i = 0; lines[i] != NULL; i++) {
win_save_print(window, '-', NULL, 0, 0, "", lines[i]); win_print(window, '-', NULL, 0, 0, "", lines[i]);
} }
} }
} }
@ -3006,11 +3006,11 @@ _win_show_history(int win_index, const char * const contact)
GDateTime *time = g_date_time_new_local(2000, 1, 1, ihh, imm, iss); GDateTime *time = g_date_time_new_local(2000, 1, 1, ihh, imm, iss);
GTimeVal tv; GTimeVal tv;
g_date_time_to_timeval(time, &tv); g_date_time_to_timeval(time, &tv);
win_save_print(window, '-', &tv, NO_COLOUR_DATE, 0, "", curr->data+11); win_print(window, '-', &tv, NO_COLOUR_DATE, 0, "", curr->data+11);
g_date_time_unref(time); g_date_time_unref(time);
// header // header
} else { } else {
win_save_print(window, '-', NULL, 0, 0, "", curr->data); win_print(window, '-', NULL, 0, 0, "", curr->data);
} }
curr = g_slist_next(curr); curr = g_slist_next(curr);
} }

58
src/ui/window.c
View File

@ -547,14 +547,14 @@ win_show_occupant(ProfWin *window, Occupant *occupant)
theme_item_t presence_colour = theme_main_presence_attrs(presence_str); theme_item_t presence_colour = theme_main_presence_attrs(presence_str);
win_save_print(window, '-', NULL, NO_EOL, presence_colour, "", occupant->nick); win_print(window, '-', NULL, NO_EOL, presence_colour, "", occupant->nick);
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str);
if (occupant->status) { if (occupant->status) {
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status);
} }
win_save_print(window, '-', NULL, NO_DATE, presence_colour, "", ""); win_print(window, '-', NULL, NO_DATE, presence_colour, "", "");
} }
void void
@ -569,9 +569,9 @@ win_show_contact(ProfWin *window, PContact contact)
theme_item_t presence_colour = theme_main_presence_attrs(presence); theme_item_t presence_colour = theme_main_presence_attrs(presence);
if (name != NULL) { if (name != NULL) {
win_save_print(window, '-', NULL, NO_EOL, presence_colour, "", name); win_print(window, '-', NULL, NO_EOL, presence_colour, "", name);
} else { } else {
win_save_print(window, '-', NULL, NO_EOL, presence_colour, "", barejid); win_print(window, '-', NULL, NO_EOL, presence_colour, "", barejid);
} }
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence);
@ -598,7 +598,7 @@ win_show_contact(ProfWin *window, PContact contact)
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", p_contact_status(contact)); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", p_contact_status(contact));
} }
win_save_print(window, '-', NULL, NO_DATE, presence_colour, "", ""); win_print(window, '-', NULL, NO_DATE, presence_colour, "", "");
} }
void void
@ -610,7 +610,7 @@ win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occup
theme_item_t presence_colour = theme_main_presence_attrs(presence_str); theme_item_t presence_colour = theme_main_presence_attrs(presence_str);
win_save_print(window, '!', NULL, NO_EOL, presence_colour, "", occupant->nick); win_print(window, '!', NULL, NO_EOL, presence_colour, "", occupant->nick);
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, presence_colour, "", " is %s", presence_str);
if (occupant->status) { if (occupant->status) {
@ -633,21 +633,21 @@ win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occup
if (caps) { if (caps) {
// show identity // show identity
if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) { if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
win_save_print(window, '!', NULL, NO_EOL, 0, "", " Identity: "); win_print(window, '!', NULL, NO_EOL, 0, "", " Identity: ");
if (caps->name != NULL) { if (caps->name != NULL) {
win_save_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->name);
if ((caps->category != NULL) || (caps->type != NULL)) { if ((caps->category != NULL) || (caps->type != NULL)) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type != NULL) { if (caps->type != NULL) {
win_save_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->type);
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(window); win_save_newline(window);
} }
@ -672,7 +672,7 @@ win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occup
caps_destroy(caps); caps_destroy(caps);
} }
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
} }
void void
@ -686,12 +686,12 @@ win_show_info(ProfWin *window, PContact contact)
theme_item_t presence_colour = theme_main_presence_attrs(presence); theme_item_t presence_colour = theme_main_presence_attrs(presence);
win_save_print(window, '-', NULL, 0, 0, "", ""); win_print(window, '-', NULL, 0, 0, "", "");
win_save_print(window, '-', NULL, NO_EOL, presence_colour, "", barejid); win_print(window, '-', NULL, NO_EOL, presence_colour, "", barejid);
if (name != NULL) { if (name != NULL) {
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (%s)", name); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (%s)", name);
} }
win_save_print(window, '-', NULL, NO_DATE, 0, "", ":"); win_print(window, '-', NULL, NO_DATE, 0, "", ":");
if (sub != NULL) { if (sub != NULL) {
win_vprint(window, '-', NULL, 0, 0, "", "Subscription: %s", sub); win_vprint(window, '-', NULL, 0, 0, "", "Subscription: %s", sub);
@ -720,7 +720,7 @@ win_show_info(ProfWin *window, PContact contact)
GList *resources = p_contact_get_available_resources(contact); GList *resources = p_contact_get_available_resources(contact);
GList *ordered_resources = NULL; GList *ordered_resources = NULL;
if (resources != NULL) { if (resources != NULL) {
win_save_print(window, '-', NULL, 0, 0, "", "Resources:"); win_print(window, '-', NULL, 0, 0, "", "Resources:");
// sort in order of availability // sort in order of availability
GList *curr = resources; GList *curr = resources;
@ -751,21 +751,21 @@ win_show_info(ProfWin *window, PContact contact)
if (caps) { if (caps) {
// show identity // show identity
if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) { if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
win_save_print(window, '-', NULL, NO_EOL, 0, "", " Identity: "); win_print(window, '-', NULL, NO_EOL, 0, "", " Identity: ");
if (caps->name != NULL) { if (caps->name != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->name); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->name);
if ((caps->category != NULL) || (caps->type != NULL)) { if ((caps->category != NULL) || (caps->type != NULL)) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->type != NULL) { if (caps->type != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->type); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->type);
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " "); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", " ");
} }
} }
if (caps->category != NULL) { if (caps->category != NULL) {
win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(window); win_save_newline(window);
} }
@ -841,7 +841,7 @@ win_show_status_string(ProfWin *window, const char * const from,
if (status != NULL) if (status != NULL)
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", status); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", status);
win_save_print(window, '-', NULL, NO_DATE, presence_colour, "", ""); win_print(window, '-', NULL, NO_DATE, presence_colour, "", "");
} }
@ -853,7 +853,7 @@ win_print_incoming_message(ProfWin *window, GTimeVal *tv_stamp,
{ {
case WIN_CHAT: case WIN_CHAT:
case WIN_PRIVATE: case WIN_PRIVATE:
win_save_print(window, '-', tv_stamp, NO_ME, THEME_TEXT_THEM, from, message); win_print(window, '-', tv_stamp, NO_ME, THEME_TEXT_THEM, from, message);
break; break;
default: default:
assert(FALSE); assert(FALSE);
@ -869,12 +869,12 @@ win_vprint(ProfWin *window, const char show_char, GTimeVal *tstamp,
va_start(arg, message); va_start(arg, message);
GString *fmt_msg = g_string_new(NULL); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, message, arg); g_string_vprintf(fmt_msg, message, arg);
win_save_print(window, show_char, tstamp, flags, theme_item, from, fmt_msg->str); win_print(window, show_char, tstamp, flags, theme_item, from, fmt_msg->str);
g_string_free(fmt_msg, TRUE); g_string_free(fmt_msg, TRUE);
} }
void void
win_save_print(ProfWin *window, const char show_char, GTimeVal *tstamp, win_print(ProfWin *window, const char show_char, GTimeVal *tstamp,
int flags, theme_item_t theme_item, const char * const from, const char * const message) int flags, theme_item_t theme_item, const char * const from, const char * const message)
{ {
GDateTime *time; GDateTime *time;
@ -894,13 +894,13 @@ win_save_print(ProfWin *window, const char show_char, GTimeVal *tstamp,
void void
win_save_println(ProfWin *window, const char * const message) win_save_println(ProfWin *window, const char * const message)
{ {
win_save_print(window, '-', NULL, 0, 0, "", message); win_print(window, '-', NULL, 0, 0, "", message);
} }
void void
win_save_newline(ProfWin *window) win_save_newline(ProfWin *window)
{ {
win_save_print(window, '-', NULL, NO_DATE, 0, "", ""); win_print(window, '-', NULL, NO_DATE, 0, "", "");
} }
static void static void

2
src/ui/window.h
View File

@ -169,7 +169,7 @@ void win_print_incoming_message(ProfWin *window, GTimeVal *tv_stamp,
void win_show_info(ProfWin *window, PContact contact); void win_show_info(ProfWin *window, PContact contact);
void win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occupant); void win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occupant);
void win_vprint(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message, ...); void win_vprint(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message, ...);
void win_save_print(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message); void win_print(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message);
void win_save_println(ProfWin *window, const char * const message); void win_save_println(ProfWin *window, const char * const message);
void win_save_newline(ProfWin *window); void win_save_newline(ProfWin *window);
void win_redraw(ProfWin *window); void win_redraw(ProfWin *window);

2
src/ui/windows.c
View File

@ -622,7 +622,7 @@ wins_lost_connection(void)
while (curr != NULL) { while (curr != NULL) {
ProfWin *window = curr->data; ProfWin *window = curr->data;
if (window->type != WIN_CONSOLE) { if (window->type != WIN_CONSOLE) {
win_save_print(window, '-', NULL, 0, THEME_ERROR, "", "Lost connection."); win_print(window, '-', NULL, 0, THEME_ERROR, "", "Lost connection.");
// if current win, set current_win_dirty // if current win, set current_win_dirty
if (wins_is_current(window)) { if (wins_is_current(window)) {