Merge branch 'master' into openpgp

This commit is contained in:
James Booth
2015-05-05 00:51:16 +01:00

View File

@@ -1672,7 +1672,10 @@ cmd_autocomplete_add(char *value)
void void
cmd_autocomplete_add_form_fields(DataForm *form) cmd_autocomplete_add_form_fields(DataForm *form)
{ {
if (form) { if (form == NULL) {
return;
}
GSList *fields = autocomplete_create_list(form->tag_ac); GSList *fields = autocomplete_create_list(form->tag_ac);
GSList *curr_field = fields; GSList *curr_field = fields;
while (curr_field) { while (curr_field) {
@@ -1683,13 +1686,15 @@ cmd_autocomplete_add_form_fields(DataForm *form)
curr_field = g_slist_next(curr_field); curr_field = g_slist_next(curr_field);
} }
g_slist_free_full(fields, free); g_slist_free_full(fields, free);
}
} }
void void
cmd_autocomplete_remove_form_fields(DataForm *form) cmd_autocomplete_remove_form_fields(DataForm *form)
{ {
if (form) { if (form == NULL) {
return;
}
GSList *fields = autocomplete_create_list(form->tag_ac); GSList *fields = autocomplete_create_list(form->tag_ac);
GSList *curr_field = fields; GSList *curr_field = fields;
while (curr_field) { while (curr_field) {
@@ -1700,7 +1705,6 @@ cmd_autocomplete_remove_form_fields(DataForm *form)
curr_field = g_slist_next(curr_field); curr_field = g_slist_next(curr_field);
} }
g_slist_free_full(fields, free); g_slist_free_full(fields, free);
}
} }
void void