From: Christian H. <ch...@us...> - 2003-12-31 07:47:08
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv32205 Modified Files: request.c Log Message: Honestly, I don't know *what* I was thinking. We no longer delete all items in a multi-select list when trying to clear the selection. Sorry, faceprint :) Index: request.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/request.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -p -r1.21 -r1.22 --- request.c 21 Dec 2003 20:51:05 -0000 1.21 +++ request.c 31 Dec 2003 07:47:01 -0000 1.22 @@ -727,17 +727,12 @@ gaim_request_field_list_clear_selected(G g_return_if_fail(field != NULL); g_return_if_fail(field->type == GAIM_REQUEST_FIELD_LIST); - if (field->u.list.items != NULL) + if (field->u.list.selected != NULL) { - g_list_foreach(field->u.list.items, (GFunc)g_free, NULL); - g_list_free(field->u.list.items); - field->u.list.items = NULL; + g_list_foreach(field->u.list.selected, (GFunc)g_free, NULL); + g_list_free(field->u.list.selected); + field->u.list.selected = NULL; } - - g_hash_table_destroy(field->u.list.item_data); - - field->u.list.item_data = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, NULL); } void @@ -747,12 +742,7 @@ gaim_request_field_list_set_selected(Gai g_return_if_fail(items != NULL); g_return_if_fail(field->type == GAIM_REQUEST_FIELD_LIST); - if (field->u.list.selected != NULL) - { - g_list_foreach(field->u.list.selected, (GFunc)g_free, NULL); - g_list_free(field->u.list.selected); - field->u.list.selected = NULL; - } + gaim_request_field_list_clear_selected(field); field->u.list.selected = items; } |