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

Added setting of unique form list values

Browse Source
This commit is contained in:
James Booth 2014-09-14 16:23:25 +01:00
parent b6242fbd3d
commit 8cfe80e979
3 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/command/commands.c
View File

@ -1979,21 +1979,33 @@ cmd_room(gchar **args, struct cmd_help_t help)
} else { } else {
form_field_type_t field_type = form_get_field_type(current->form, tag); form_field_type_t field_type = form_get_field_type(current->form, tag);
gboolean valid = FALSE; gboolean valid = FALSE;
gboolean added = FALSE;
switch (field_type) { switch (field_type) {
case FIELD_LIST_MULTI: case FIELD_LIST_MULTI:
valid = form_field_contains_option(current->form, tag, value); valid = form_field_contains_option(current->form, tag, value);
if (valid == TRUE) { if (valid) {
form_add_value(current->form, tag, value); added = form_add_unique_value(current->form, tag, value);
ui_current_print_line("Added %s to %s", value, tag); if (added) {
ui_current_print_line("Added %s to %s", value, tag);
} else {
ui_current_print_line("Value %s already selected for %s", value, tag);
}
} else { } else {
ui_current_print_line("Value %s not a valid option for field: %s", value, tag); ui_current_print_line("Value %s not a valid option for field: %s", value, tag);
} }
break; break;
case FIELD_TEXT_MULTI: case FIELD_TEXT_MULTI:
case FIELD_JID_MULTI:
form_add_value(current->form, tag, value); form_add_value(current->form, tag, value);
ui_current_print_line("Added %s to %s", value, tag); ui_current_print_line("Added %s to %s", value, tag);
break; break;
case FIELD_JID_MULTI:
added = form_add_unique_value(current->form, tag, value);
if (added) {
ui_current_print_line("Added %s to %s", value, tag);
} else {
ui_current_print_line("JID %s already exists in %s", value, tag);
}
break;
default: default:
ui_current_print_line("Add command not valid for field: %s", tag); ui_current_print_line("Add command not valid for field: %s", tag);
break; break;

43
src/xmpp/form.c
View File

@ -430,6 +430,7 @@ _form_set_value(DataForm *form, const char * const tag, char *value)
if (g_strcmp0(field->var, var) == 0) { if (g_strcmp0(field->var, var) == 0) {
if (g_slist_length(field->values) == 0) { if (g_slist_length(field->values) == 0) {
field->values = g_slist_append(field->values, strdup(value)); field->values = g_slist_append(field->values, strdup(value));
return;
} else if (g_slist_length(field->values) == 1) { } else if (g_slist_length(field->values) == 1) {
free(field->values->data); free(field->values->data);
field->values->data = strdup(value); field->values->data = strdup(value);
@ -450,19 +451,7 @@ _form_add_value(DataForm *form, const char * const tag, char *value)
while (curr != NULL) { while (curr != NULL) {
FormField *field = curr->data; FormField *field = curr->data;
if (g_strcmp0(field->var, var) == 0) { if (g_strcmp0(field->var, var) == 0) {
gboolean already_set = FALSE; field->values = g_slist_append(field->values, strdup(value));
GSList *curr_value = field->values;
while (curr_value != NULL) {
if (g_strcmp0(curr_value->data, value) == 0) {
already_set = TRUE;
break;
}
curr_value = g_slist_next(curr_value);
}
if (!already_set) {
field->values = g_slist_append(field->values, strdup(value));
}
return; return;
} }
curr = g_slist_next(curr); curr = g_slist_next(curr);
@ -470,6 +459,33 @@ _form_add_value(DataForm *form, const char * const tag, char *value)
} }
} }
static gboolean
_form_add_unique_value(DataForm *form, const char * const tag, char *value)
{
char *var = g_hash_table_lookup(form->tag_to_var, tag);
if (var != NULL) {
GSList *curr = form->fields;
while (curr != NULL) {
FormField *field = curr->data;
if (g_strcmp0(field->var, var) == 0) {
GSList *curr_value = field->values;
while (curr_value != NULL) {
if (g_strcmp0(curr_value->data, value) == 0) {
return FALSE;
}
curr_value = g_slist_next(curr_value);
}
field->values = g_slist_append(field->values, strdup(value));
return TRUE;
}
curr = g_slist_next(curr);
}
}
return FALSE;
}
static void static void
_form_remove_value(DataForm *form, const char * const tag, char *value) _form_remove_value(DataForm *form, const char * const tag, char *value)
{ {
@ -508,6 +524,7 @@ form_init_module(void)
form_get_form_type_field = _form_get_form_type_field; form_get_form_type_field = _form_get_form_type_field;
form_get_field_type = _form_get_field_type; form_get_field_type = _form_get_field_type;
form_set_value = _form_set_value; form_set_value = _form_set_value;
form_add_unique_value = _form_add_unique_value;
form_add_value = _form_add_value; form_add_value = _form_add_value;
form_remove_value = _form_remove_value; form_remove_value = _form_remove_value;
form_field_contains_option = _form_field_contains_option; form_field_contains_option = _form_field_contains_option;

1
src/xmpp/xmpp.h
View File

@ -209,6 +209,7 @@ void (*roster_send_remove)(const char * const barejid);
void (*form_destroy)(DataForm *form); void (*form_destroy)(DataForm *form);
char * (*form_get_form_type_field)(DataForm *form); char * (*form_get_form_type_field)(DataForm *form);
void (*form_set_value)(DataForm *form, const char * const tag, char *value); void (*form_set_value)(DataForm *form, const char * const tag, char *value);
gboolean (*form_add_unique_value)(DataForm *form, const char * const tag, char *value);
void (*form_add_value)(DataForm *form, const char * const tag, char *value); void (*form_add_value)(DataForm *form, const char * const tag, char *value);
void (*form_remove_value)(DataForm *form, const char * const tag, char *value); void (*form_remove_value)(DataForm *form, const char * const tag, char *value);
gboolean (*form_tag_exists)(DataForm *form, const char * const tag); gboolean (*form_tag_exists)(DataForm *form, const char * const tag);