What was I thinking... The GtkIMHtmlSmileys in the smiley trees aren't owned

Fri, 24 Oct 2008 21:50:55 +0000

author
Marcus Lundblad <malu@pidgin.im>
date
Fri, 24 Oct 2008 21:50:55 +0000
changeset 24511
19fe55ed0ea5
parent 24510
925061f2b31e
child 24512
1b6566df90b5

What was I thinking... The GtkIMHtmlSmileys in the smiley trees aren't owned
by the smiley trees, so NULLing a pointer in there is not a good idea...
By the time gtk_smiley_tree_destroy is called the smileys are gone.
This should fix #7345 and that "crash when changing smiley theme while there
are smileys in input boxes" bug someone reported on #pidgin
Closes #7345

pidgin/gtkimhtml.c file | annotate | diff | comparison | revisions
--- a/pidgin/gtkimhtml.c	Fri Oct 24 17:42:32 2008 +0000
+++ b/pidgin/gtkimhtml.c	Fri Oct 24 21:50:55 2008 +0000
@@ -348,9 +348,7 @@
 			g_string_free (t->values, TRUE);
 			g_free (t->children);
 		}
-		if (t && t->image) {
-			t->image->imhtml = NULL;
-		}
+		
 		g_free (t);
 	}
 }

mercurial