# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1042136360 0
# Node ID f1876640e56817a9d0931bab6e7439efe3afeeab
# Parent  74f65a3d2a1f715d5311ca3004476dad97e5325a
[gaim-migrate @ 4515]
9 Penguin Points awarded to Nathan D. Walp.

committer: Tailor Script <tailor@pidgin.im>

diff -r 74f65a3d2a1f -r f1876640e568 src/gtkimhtml.c
--- a/src/gtkimhtml.c	Thu Jan 09 09:41:49 2003 +0000
+++ b/src/gtkimhtml.c	Thu Jan 09 18:19:20 2003 +0000
@@ -98,9 +98,8 @@
 }
 
 
-gboolean gtk_smiley_tree_destroy (GtkSmileyTree *tree)
+void gtk_smiley_tree_destroy (GtkSmileyTree *tree)
 {
-	/*
 	GSList *list = g_slist_append (NULL, tree);
 
 	while (list) {
@@ -115,8 +114,6 @@
 		}
 		g_free (t);
 	}
-	return TRUE;
-	*/
 }
 
 
@@ -130,12 +127,19 @@
 };
 static guint signals [LAST_SIGNAL] = { 0 };
 
+static gboolean
+gtk_smiley_tree_destroy_from_hash(gpointer key, gpointer value,
+		gpointer user_data)
+{
+	gtk_smiley_tree_destroy(value);
+	return TRUE;
+}
+
 static void
 gtk_imhtml_finalize (GObject *object)
 {
 	GtkIMHtml *imhtml = GTK_IMHTML(object);
-
-	g_hash_table_foreach_remove(imhtml->smiley_data, (GHRFunc)gtk_smiley_tree_destroy, NULL);
+	g_hash_table_foreach_remove(imhtml->smiley_data, gtk_smiley_tree_destroy_from_hash, NULL);
 	g_hash_table_destroy(imhtml->smiley_data);
 	gtk_smiley_tree_destroy(imhtml->default_smilies);
 	gdk_cursor_unref(imhtml->hand_cursor);