devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-27 21:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove win_print, use win_printf instead

Browse Source
This commit is contained in:
James Booth
2016-10-11 23:38:59 +01:00
parent 0337c5b22c
commit 0890179fc4
13 changed files with 230 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/ui/mucconfwin.c
View File

@@ -47,12 +47,12 @@ mucconfwin_show_form(ProfMucConfWin *confwin)
{
ProfWin *window = (ProfWin*) confwin;
if (confwin->form->title) {
win_print(window, '-', 0, NULL, NO_EOL, 0, "", "Form title: ");
win_print(window, '-', 0, NULL, NO_DATE, 0, "", confwin->form->title);
win_printf(window, '-', 0, NULL, NO_EOL, 0, "", "Form title: ");
win_printf(window, '-', 0, NULL, NO_DATE, 0, "", confwin->form->title);
} else {
win_printf(window, '-', 0, NULL, 0, 0, "", "Configuration for room %s.", confwin->roomjid);
}
win_print(window, '-', 0, NULL, 0, 0, "", "");
win_printf(window, '-', 0, NULL, 0, 0, "", "");
mucconfwin_form_help(confwin);
@@ -64,7 +64,7 @@ mucconfwin_show_form(ProfMucConfWin *confwin)
if ((g_strcmp0(field->type, "fixed") == 0) && field->values) {
if (field->values) {
char *value = field->values->data;
win_print(window, '-', 0, NULL, 0, 0, "", value);
win_printf(window, '-', 0, NULL, 0, 0, "", value);
}
} else if (g_strcmp0(field->type, "hidden") != 0 && field->var) {
char *tag = g_hash_table_lookup(confwin->form->var_to_tag, field->var);
@@ -96,11 +96,11 @@ mucconfwin_handle_configuration(ProfMucConfWin *confwin, DataForm *form)
mucconfwin_show_form(confwin);
win_print(window, '-', 0, NULL, 0, 0, "", "");
win_print(window, '-', 0, NULL, 0, 0, "", "Use '/form submit' to save changes.");
win_print(window, '-', 0, NULL, 0, 0, "", "Use '/form cancel' to cancel changes.");
win_print(window, '-', 0, NULL, 0, 0, "", "See '/form help' for more information.");
win_print(window, '-', 0, NULL, 0, 0, "", "");
win_printf(window, '-', 0, NULL, 0, 0, "", "");
win_printf(window, '-', 0, NULL, 0, 0, "", "Use '/form submit' to save changes.");
win_printf(window, '-', 0, NULL, 0, 0, "", "Use '/form cancel' to cancel changes.");
win_printf(window, '-', 0, NULL, 0, 0, "", "See '/form help' for more information.");
win_printf(window, '-', 0, NULL, 0, 0, "", "");
}
void
@@ -111,11 +111,11 @@ mucconfwin_field_help(ProfMucConfWin *confwin, char *tag)
ProfWin *window = (ProfWin*) confwin;
FormField *field = form_get_field_by_tag(confwin->form, tag);
if (field) {
win_print(window, '-', 0, NULL, NO_EOL, 0, "", field->label);
win_printf(window, '-', 0, NULL, NO_EOL, 0, "", field->label);
if (field->required) {
win_print(window, '-', 0, NULL, NO_DATE, 0, "", " (Required):");
win_printf(window, '-', 0, NULL, NO_DATE, 0, "", " (Required):");
} else {
win_print(window, '-', 0, NULL, NO_DATE, 0, "", ":");
win_printf(window, '-', 0, NULL, NO_DATE, 0, "", ":");
}
if (field->description) {
win_printf(window, '-', 0, NULL, 0, 0, "", " Description : %s", field->description);
@@ -130,12 +130,12 @@ mucconfwin_field_help(ProfMucConfWin *confwin, char *tag)
case FIELD_TEXT_SINGLE:
case FIELD_TEXT_PRIVATE:
win_printf(window, '-', 0, NULL, 0, 0, "", " Set : /%s <value>", tag);
win_print(window, '-', 0, NULL, 0, 0, "", " Where : <value> is any text");
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> is any text");
break;
case FIELD_TEXT_MULTI:
num_values = form_get_value_count(confwin->form, tag);
win_printf(window, '-', 0, NULL, 0, 0, "", " Add : /%s add <value>", tag);
win_print(window, '-', 0, NULL, 0, 0, "", " Where : <value> is any text");
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> is any text");
if (num_values > 0) {
win_printf(window, '-', 0, NULL, 0, 0, "", " Remove : /%s remove <value>", tag);
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> between 'val1' and 'val%d'", num_values);
@@ -143,11 +143,11 @@ mucconfwin_field_help(ProfMucConfWin *confwin, char *tag)
break;
case FIELD_BOOLEAN:
win_printf(window, '-', 0, NULL, 0, 0, "", " Set : /%s <value>", tag);
win_print(window, '-', 0, NULL, 0, 0, "", " Where : <value> is either 'on' or 'off'");
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> is either 'on' or 'off'");
break;
case FIELD_LIST_SINGLE:
win_printf(window, '-', 0, NULL, 0, 0, "", " Set : /%s <value>", tag);
win_print(window, '-', 0, NULL, 0, 0, "", " Where : <value> is one of");
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> is one of");
curr_option = field->options;
while (curr_option) {
option = curr_option->data;
@@ -158,7 +158,7 @@ mucconfwin_field_help(ProfMucConfWin *confwin, char *tag)
case FIELD_LIST_MULTI:
win_printf(window, '-', 0, NULL, 0, 0, "", " Add : /%s add <value>", tag);
win_printf(window, '-', 0, NULL, 0, 0, "", " Remove : /%s remove <value>", tag);
win_print(window, '-', 0, NULL, 0, 0, "", " Where : <value> is one of");
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> is one of");
curr_option = field->options;
while (curr_option) {
option = curr_option->data;
@@ -168,12 +168,12 @@ mucconfwin_field_help(ProfMucConfWin *confwin, char *tag)
break;
case FIELD_JID_SINGLE:
win_printf(window, '-', 0, NULL, 0, 0, "", " Set : /%s <value>", tag);
win_print(window, '-', 0, NULL, 0, 0, "", " Where : <value> is a valid Jabber ID");
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> is a valid Jabber ID");
break;
case FIELD_JID_MULTI:
win_printf(window, '-', 0, NULL, 0, 0, "", " Add : /%s add <value>", tag);
win_printf(window, '-', 0, NULL, 0, 0, "", " Remove : /%s remove <value>", tag);
win_print(window, '-', 0, NULL, 0, 0, "", " Where : <value> is a valid Jabber ID");
win_printf(window, '-', 0, NULL, 0, 0, "", " Where : <value> is a valid Jabber ID");
break;
case FIELD_FIXED:
case FIELD_UNKNOWN:
@@ -193,9 +193,9 @@ mucconfwin_form_help(ProfMucConfWin *confwin)
if (confwin->form->instructions) {
ProfWin *window = (ProfWin*) confwin;
win_print(window, '-', 0, NULL, 0, 0, "", "Supplied instructions:");
win_print(window, '-', 0, NULL, 0, 0, "", confwin->form->instructions);
win_print(window, '-', 0, NULL, 0, 0, "", "");
win_printf(window, '-', 0, NULL, 0, 0, "", "Supplied instructions:");
win_printf(window, '-', 0, NULL, 0, 0, "", confwin->form->instructions);
win_printf(window, '-', 0, NULL, 0, 0, "", "");
}
}
@@ -205,9 +205,9 @@ _mucconfwin_form_field(ProfWin *window, char *tag, FormField *field)
win_printf(window, '-', 0, NULL, NO_EOL, THEME_AWAY, "", "[%s] ", tag);
win_printf(window, '-', 0, NULL, NO_EOL | NO_DATE, 0, "", "%s", field->label);
if (field->required) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " (required): ");
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", " (required): ");
} else {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ": ");
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", ": ");
}
GSList *values = field->values;
@@ -221,9 +221,9 @@ _mucconfwin_form_field(ProfWin *window, char *tag, FormField *field)
char *value = curr_value->data;
if (value) {
if (g_strcmp0(field->var, "muc#roomconfig_roomsecret") == 0) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]");
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]");
} else {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value);
}
}
}
@@ -233,7 +233,7 @@ _mucconfwin_form_field(ProfWin *window, char *tag, FormField *field)
if (curr_value) {
char *value = curr_value->data;
if (value) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]");
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]");
}
}
win_newline(window);
@@ -252,16 +252,16 @@ _mucconfwin_form_field(ProfWin *window, char *tag, FormField *field)
break;
case FIELD_BOOLEAN:
if (curr_value == NULL) {
win_print(window, '-', 0, NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
win_printf(window, '-', 0, NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
} else {
char *value = curr_value->data;
if (value == NULL) {
win_print(window, '-', 0, NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
win_printf(window, '-', 0, NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
} else {
if (g_strcmp0(value, "0") == 0) {
win_print(window, '-', 0, NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
win_printf(window, '-', 0, NULL, NO_DATE, THEME_OFFLINE, "", "FALSE");
} else {
win_print(window, '-', 0, NULL, NO_DATE, THEME_ONLINE, "", "TRUE");
win_printf(window, '-', 0, NULL, NO_DATE, THEME_ONLINE, "", "TRUE");
}
}
}
@@ -303,7 +303,7 @@ _mucconfwin_form_field(ProfWin *window, char *tag, FormField *field)
if (curr_value) {
char *value = curr_value->data;
if (value) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value);
}
}
win_newline(window);
@@ -320,7 +320,7 @@ _mucconfwin_form_field(ProfWin *window, char *tag, FormField *field)
if (curr_value) {
char *value = curr_value->data;
if (value) {
win_print(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", value);
win_printf(window, '-', 0, NULL, NO_DATE | NO_EOL, 0, "", value);
}
}
win_newline(window);