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

Allow utf8 symbols as omemo/pgp/otr indicator char

Browse Source 
Fix https://github.com/profanity-im/profanity/issues/1264
This commit is contained in:
Michael Vetter
2020-02-20 18:11:08 +01:00
parent 280b718cfb
commit 1f8b1eb740
21 changed files with 643 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/ui/confwin.c
View File

@@ -48,12 +48,12 @@ confwin_show_form(ProfConfWin *confwin)
{
ProfWin *window = (ProfWin*) confwin;
if (confwin->form->title) {
win_print(window, THEME_DEFAULT, '-', "Form title: ");
win_print(window, THEME_DEFAULT, "-", "Form title: ");
win_appendln(window, THEME_DEFAULT, "%s", confwin->form->title);
} else {
win_println(window, THEME_DEFAULT, '-', "Configuration for room %s.", confwin->roomjid);
win_println(window, THEME_DEFAULT, "-", "Configuration for room %s.", confwin->roomjid);
}
win_println(window, THEME_DEFAULT, '-', "");
win_println(window, THEME_DEFAULT, "-", "");
confwin_form_help(confwin);
@@ -65,7 +65,7 @@ confwin_show_form(ProfConfWin *confwin)
if ((g_strcmp0(field->type, "fixed") == 0) && field->values) {
if (field->values) {
char *value = field->values->data;
win_println(window, THEME_DEFAULT, '-', "%s", value);
win_println(window, THEME_DEFAULT, "-", "%s", value);
}
} else if (g_strcmp0(field->type, "hidden") != 0 && field->var) {
char *tag = g_hash_table_lookup(confwin->form->var_to_tag, field->var);
@@ -84,7 +84,7 @@ confwin_show_form_field(ProfConfWin *confwin, DataForm *form, char *tag)
FormField *field = form_get_field_by_tag(form, tag);
ProfWin *window = (ProfWin*)confwin;
_confwin_form_field(window, tag, field);
win_println(window, THEME_DEFAULT, '-', "");
win_println(window, THEME_DEFAULT, "-", "");
}
void
@@ -97,13 +97,13 @@ confwin_handle_configuration(ProfConfWin *confwin, DataForm *form)
confwin_show_form(confwin);
win_println(window, THEME_DEFAULT, '-', "");
win_println(window, THEME_DEFAULT, "-", "");
if (confwin->submit != NULL) {
win_println(window, THEME_DEFAULT, '-', "Use '/form submit' to save changes.");
win_println(window, THEME_DEFAULT, "-", "Use '/form submit' to save changes.");
}
win_println(window, THEME_DEFAULT, '-', "Use '/form cancel' to cancel changes.");
win_println(window, THEME_DEFAULT, '-', "See '/form help' for more information.");
win_println(window, THEME_DEFAULT, '-', "");
win_println(window, THEME_DEFAULT, "-", "Use '/form cancel' to cancel changes.");
win_println(window, THEME_DEFAULT, "-", "See '/form help' for more information.");
win_println(window, THEME_DEFAULT, "-", "");
}
void
@@ -114,16 +114,16 @@ confwin_field_help(ProfConfWin *confwin, char *tag)
ProfWin *window = (ProfWin*) confwin;
FormField *field = form_get_field_by_tag(confwin->form, tag);
if (field) {
win_print(window, THEME_DEFAULT, '-', "%s", field->label);
win_print(window, THEME_DEFAULT, "-", "%s", field->label);
if (field->required) {
win_appendln(window, THEME_DEFAULT, " (Required):");
} else {
win_appendln(window, THEME_DEFAULT, ":");
}
if (field->description) {
win_println(window, THEME_DEFAULT, '-', " Description : %s", field->description);
win_println(window, THEME_DEFAULT, "-", " Description : %s", field->description);
}
win_println(window, THEME_DEFAULT, '-', " Type : %s", field->type);
win_println(window, THEME_DEFAULT, "-", " Type : %s", field->type);
int num_values = 0;
GSList *curr_option = NULL;
@@ -132,51 +132,51 @@ confwin_field_help(ProfConfWin *confwin, char *tag)
switch (field->type_t) {
case FIELD_TEXT_SINGLE:
case FIELD_TEXT_PRIVATE:
win_println(window, THEME_DEFAULT, '-', " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> is any text");
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is any text");
break;
case FIELD_TEXT_MULTI:
num_values = form_get_value_count(confwin->form, tag);
win_println(window, THEME_DEFAULT, '-', " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> is any text");
win_println(window, THEME_DEFAULT, "-", " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is any text");
if (num_values > 0) {
win_println(window, THEME_DEFAULT, '-', " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> between 'val1' and 'val%d'", num_values);
win_println(window, THEME_DEFAULT, "-", " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> between 'val1' and 'val%d'", num_values);
}
break;
case FIELD_BOOLEAN:
win_println(window, THEME_DEFAULT, '-', " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> is either 'on' or 'off'");
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is either 'on' or 'off'");
break;
case FIELD_LIST_SINGLE:
win_println(window, THEME_DEFAULT, '-', " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> is one of");
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is one of");
curr_option = field->options;
while (curr_option) {
option = curr_option->data;
win_println(window, THEME_DEFAULT, '-', " %s", option->value);
win_println(window, THEME_DEFAULT, "-", " %s", option->value);
curr_option = g_slist_next(curr_option);
}
break;
case FIELD_LIST_MULTI:
win_println(window, THEME_DEFAULT, '-', " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> is one of");
win_println(window, THEME_DEFAULT, "-", " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is one of");
curr_option = field->options;
while (curr_option) {
option = curr_option->data;
win_println(window, THEME_DEFAULT, '-', " %s", option->value);
win_println(window, THEME_DEFAULT, "-", " %s", option->value);
curr_option = g_slist_next(curr_option);
}
break;
case FIELD_JID_SINGLE:
win_println(window, THEME_DEFAULT, '-', " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> is a valid Jabber ID");
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is a valid Jabber ID");
break;
case FIELD_JID_MULTI:
win_println(window, THEME_DEFAULT, '-', " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, '-', " Where : <value> is a valid Jabber ID");
win_println(window, THEME_DEFAULT, "-", " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is a valid Jabber ID");
break;
case FIELD_FIXED:
case FIELD_UNKNOWN:
@@ -185,7 +185,7 @@ confwin_field_help(ProfConfWin *confwin, char *tag)
break;
}
} else {
win_println(window, THEME_DEFAULT, '-', "No such field %s", tag);
win_println(window, THEME_DEFAULT, "-", "No such field %s", tag);
}
}
@@ -196,16 +196,16 @@ confwin_form_help(ProfConfWin *confwin)
if (confwin->form->instructions) {
ProfWin *window = (ProfWin*) confwin;
win_println(window, THEME_DEFAULT, '-', "Supplied instructions:");
win_println(window, THEME_DEFAULT, '-', "%s", confwin->form->instructions);
win_println(window, THEME_DEFAULT, '-', "");
win_println(window, THEME_DEFAULT, "-", "Supplied instructions:");
win_println(window, THEME_DEFAULT, "-", "%s", confwin->form->instructions);
win_println(window, THEME_DEFAULT, "-", "");
}
}
static void
_confwin_form_field(ProfWin *window, char *tag, FormField *field)
{
win_print(window, THEME_AWAY, '-', "[%s] ", tag);
win_print(window, THEME_AWAY, "-", "[%s] ", tag);
win_append(window, THEME_DEFAULT, "%s", field->label);
if (field->required) {
win_append(window, THEME_DEFAULT, " (required): ");
@@ -248,7 +248,7 @@ _confwin_form_field(ProfWin *window, char *tag, FormField *field)
char *value = curr_value->data;
GString *val_tag = g_string_new("");
g_string_printf(val_tag, "val%d", index++);
win_println(window, THEME_ONLINE, '-', " [%s] %s", val_tag->str, value);
win_println(window, THEME_ONLINE, "-", " [%s] %s", val_tag->str, value);
g_string_free(val_tag, TRUE);
curr_value = g_slist_next(curr_value);
}
@@ -278,9 +278,9 @@ _confwin_form_field(ProfWin *window, char *tag, FormField *field)
while (curr_option) {
FormOption *option = curr_option->data;
if (g_strcmp0(option->value, value) == 0) {
win_println(window, THEME_ONLINE, '-', " [%s] %s", option->value, option->label);
win_println(window, THEME_ONLINE, "-", " [%s] %s", option->value, option->label);
} else {
win_println(window, THEME_OFFLINE, '-', " [%s] %s", option->value, option->label);
win_println(window, THEME_OFFLINE, "-", " [%s] %s", option->value, option->label);
}
curr_option = g_slist_next(curr_option);
}
@@ -294,9 +294,9 @@ _confwin_form_field(ProfWin *window, char *tag, FormField *field)
while (curr_option) {
FormOption *option = curr_option->data;
if (g_slist_find_custom(curr_value, option->value, (GCompareFunc)g_strcmp0)) {
win_println(window, THEME_ONLINE, '-', " [%s] %s", option->value, option->label);
win_println(window, THEME_ONLINE, "-", " [%s] %s", option->value, option->label);
} else {
win_println(window, THEME_OFFLINE, '-', " [%s] %s", option->value, option->label);
win_println(window, THEME_OFFLINE, "-", " [%s] %s", option->value, option->label);
}
curr_option = g_slist_next(curr_option);
}
@@ -315,7 +315,7 @@ _confwin_form_field(ProfWin *window, char *tag, FormField *field)
win_newline(window);
while (curr_value) {
char *value = curr_value->data;
win_println(window, THEME_ONLINE, '-', " %s", value);
win_println(window, THEME_ONLINE, "-", " %s", value);
curr_value = g_slist_next(curr_value);
}
break;