diff options
| author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-05-07 00:35:55 +0000 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2008-05-07 00:35:55 +0000 |
| commit | 8f3a1426be5681c642e5322569939e2a2840fa09 (patch) | |
| tree | bc9d2231bb0a6b7a4025e5d832bb4a43dae2bbb6 | |
| parent | a5ce5ec7283c50785945e614d5fab7442f9017d8 (diff) | |
| download | pidgin-8f3a1426be5681c642e5322569939e2a2840fa09.tar.gz | |
Plug a small memory leak in the smiley dialog, and use g_new0/g_free
instead of malloc/free.
| -rw-r--r-- | pidgin/gtkimhtmltoolbar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c index 9473826f04..4883ee66d2 100644 --- a/pidgin/gtkimhtmltoolbar.c +++ b/pidgin/gtkimhtmltoolbar.c @@ -620,7 +620,7 @@ sort_smileys(struct smiley_button_list *ls, GtkIMHtmlToolbar *toolbar, int *widt 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 @@ insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) 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 @@ insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) } col++; it = it->next; - free(it_tmp); + g_free(it_tmp); } gtk_box_pack_start(GTK_BOX(smiley_table), line, FALSE, TRUE, 0); |