# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 991950603 0
# Node ID 1bd70305b227a41d1877bc090ffe3ea7192eceb1
# Parent  1053abe6e9f4452cf6b8cb4b83ae6bdad18440cd
[gaim-migrate @ 1983]
fixes.

committer: Tailor Script <tailor@pidgin.im>

diff -r 1053abe6e9f4 -r 1bd70305b227 src/oscar.c
--- a/src/oscar.c	Thu Jun 07 07:38:29 2001 +0000
+++ b/src/oscar.c	Thu Jun 07 21:50:03 2001 +0000
@@ -532,7 +532,7 @@
 			gdk_pixbuf_unref(n->unanim);
 		if (n->timer)
 			gtk_timeout_remove(n->timer);
-		if (n->cnv)
+		if (n->cnv && n->pix)
 			gtk_container_remove(GTK_CONTAINER(n->cnv->bbox), n->pix);
 		g_free(n->user);
 		if (n->data)
@@ -1779,7 +1779,6 @@
 				gtk_timeout_remove(ir->timer);
 			ir->timer = 0;
 
-			ir->cnv = c;
 			ir->length = args->info.icon.length;
 
 			if (!ir->length)
@@ -1810,6 +1809,7 @@
 				gdk_pixbuf_render_pixmap_and_mask(ir->unanim, &pm, &bm, 0);
 			}
 
+			ir->cnv = c;
 			ir->pix = gtk_pixmap_new(pm, bm);
 			gtk_box_pack_start(GTK_BOX(c->bbox), ir->pix, FALSE, FALSE, 5);
 			if (ir->anim && (gdk_pixbuf_animation_get_num_frames(ir->anim) > 1))