Re: [evolution-patches] Fix some problems

[Larry Ewing <lewing ximian com>]

doh!

On Wed, 2003-06-25 at 19:13, Jeffrey Stedfast wrote:
> ... ? :-)
> 
> On Wed, 2003-06-25 at 18:40, Larry Ewing wrote:
> > I accidentally committed a broken change when I commited the big leak
> > fix, this fixes that change (and the leak that was there before).  It
> > also includes a simple leak fix for the animation iterator in the image
> > code.
> > 
> > --Larry
> > 

===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlimage.c,v
retrieving revision 1.187
diff -u -p -r1.187 htmlimage.c
--- htmlimage.c	21 May 2003 15:21:22 -0000	1.187
+++ htmlimage.c	25 Jun 2003 22:26:54 -0000
@@ -1284,6 +1287,10 @@ free_image_ptr_data (HTMLImagePointer *i
 		g_object_unref (ip->animation);
 		ip->animation = NULL;
 	}
+	if (ip->iter) {
+		g_object_unref (ip->iter);
+		ip->iter = NULL;
+	}
 }
 
 static void
@@ -1302,7 +1309,7 @@ html_image_pointer_unref (HTMLImagePoint
 
 	ip->refcount--;
 	/* printf ("unref(%p) %s --> %d\n", ip, ip->url, ip->refcount); */
-	if (ip->refcount <= 0) {
+	if (ip->refcount < 1) {
 		/* printf ("freeing %s\n", ip->url); */
 		html_image_pointer_remove_stall (ip);
 		html_image_pointer_stop_animation (ip);
Index: gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.518
diff -u -p -r1.518 gtkhtml.c
--- gtkhtml.c	25 Jun 2003 18:15:46 -0000	1.518
+++ gtkhtml.c	25 Jun 2003 22:28:25 -0000
@@ -738,7 +738,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLP
 		fixed_desc = pango_font_description_from_string (fixed_name);
 		if (pango_font_description_get_family (fixed_desc)) {
 			fixed_size = PANGO_PIXELS (pango_font_description_get_size (fixed_desc));
-			(const gchar *) fixed_family = pango_font_description_get_family (fixed_desc);
+			fixed_family = g_strdup (pango_font_description_get_family (fixed_desc));
 		} else {
 			g_free (fixed_name);
 			fixed_name = NULL;