Mercurial > pidgin.yaz
diff pidgin/gtkimhtmltoolbar.c @ 23113:8c3444f04709
propagate from branch 'im.pidgin.pidgin' (head d7144f5dbbde09137aff1ceadfd419e25303bf7d)
to branch 'im.pidgin.pidgin.next.minor' (head b6f1c6f279a87ac4b59426eea116c349eb31fe8c)
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Wed, 07 May 2008 12:14:28 +0000 |
parents | 28005860d2c9 |
children | b8f861d7b540 ac567757d236 f9fd7ddf6996 |
line wrap: on
line diff
--- a/pidgin/gtkimhtmltoolbar.c Mon May 05 06:55:00 2008 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Wed May 07 12:14:28 2008 +0000 @@ -620,7 +620,7 @@ struct smiley_button_list *cur; struct smiley_button_list *it, *it_last; - cur = malloc(sizeof(struct smiley_button_list)); + cur = g_new0(struct smiley_button_list, 1); it = ls; it_last = ls; /* list iterators*/ image = gtk_image_new_from_file(filename); @@ -732,10 +732,9 @@ while (unique_smileys) { GtkIMHtmlSmiley *smiley = unique_smileys->data; if (!smiley->hidden) { - fflush(stdout); ls = sort_smileys(ls, toolbar, &max_line_width, smiley->file, smiley->smile); } - unique_smileys = unique_smileys->next; + unique_smileys = g_slist_delete_link(unique_smileys, unique_smileys); } /* pack buttons of the list */ max_line_width = max_line_width / num_lines; @@ -754,7 +753,7 @@ } col++; it = it->next; - free(it_tmp); + g_free(it_tmp); } gtk_box_pack_start(GTK_BOX(smiley_table), line, FALSE, TRUE, 0);