aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Autocompletion takes NULL str_func parameter

Browse Source 
For cases where the list is made of pure strings,
rather than some struct (void *)
This commit is contained in:
James Booth 2012-05-13 23:35:02 +01:00
parent 6c9cbc446d
commit 718229d08c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
prof_autocomplete.c
View File

@ -75,13 +75,15 @@ void p_autocomplete_add(PAutocomplete ac, void *item, PStrFunc str_func,
while(curr) { while(curr) {
// insert // insert
if (g_strcmp0(str_func(curr->data), str_func(item)) > 0) { if ( ((str_func == NULL) && (g_strcmp0(curr->data, item) > 0)) ||
((g_strcmp0(str_func(curr->data), str_func(item)) > 0)) ) {
ac->items = g_slist_insert_before(ac->items, ac->items = g_slist_insert_before(ac->items,
curr, item); curr, item);
return; return;
// update // update
} else if (g_strcmp0(str_func(curr->data), str_func(item)) == 0) { } else if ( ((str_func == NULL) && (g_strcmp0(curr->data, item) == 0)) ||
((g_strcmp0(str_func(curr->data), str_func(item)) == 0)) ) {
free_func(curr->data); free_func(curr->data);
curr->data = item; curr->data = item;
return; return;
@ -102,7 +104,8 @@ void p_autocomplete_remove(PAutocomplete ac, const char * const item,
{ {
// reset last found if it points to the item to be removed // reset last found if it points to the item to be removed
if (ac->last_found != NULL) if (ac->last_found != NULL)
if (g_strcmp0(str_func(ac->last_found->data), item) == 0) if ( ((str_func == NULL) && (g_strcmp0(ac->last_found->data, item) == 0)) ||
((g_strcmp0(str_func(ac->last_found->data), item) == 0)) )
ac->last_found = NULL; ac->last_found = NULL;
if (!ac->items) { if (!ac->items) {
@ -111,7 +114,8 @@ void p_autocomplete_remove(PAutocomplete ac, const char * const item,
GSList *curr = ac->items; GSList *curr = ac->items;
while(curr) { while(curr) {
if (g_strcmp0(str_func(curr->data), item) == 0) { if ( ((str_func == NULL) && (g_strcmp0(curr->data, item) == 0)) ||
((g_strcmp0(str_func(curr->data), item) == 0)) ) {
void *current_item = curr->data; void *current_item = curr->data;
ac->items = g_slist_remove(ac->items, curr->data); ac->items = g_slist_remove(ac->items, curr->data);
free_func(current_item); free_func(current_item);
@ -180,9 +184,11 @@ static gchar * _search_from(PAutocomplete ac, GSList *curr, PStrFunc str_func)
while(curr) { while(curr) {
// match found // match found
if (strncmp(str_func(curr->data), if ( ( (str_func == NULL) && (strncmp(curr->data, ac->search_str,
strlen(ac->search_str)) == 0) ) ||
( (strncmp(str_func(curr->data),
ac->search_str, ac->search_str,
strlen(ac->search_str)) == 0) { strlen(ac->search_str)) == 0) ) ) {
gchar *result = gchar *result =
(gchar *) malloc((strlen(str_func(curr->data)) + 1) * sizeof(gchar)); (gchar *) malloc((strlen(str_func(curr->data)) + 1) * sizeof(gchar));