Re: [evolution-patches] Fix some problems

[Larry Ewing <lewing ximian com>]

Yeah, I was tired yesterday.  Here is an updated patch that includes all
the configure.in and Makefile.am changes for the release and doesn't dup
the string,

--Larry

On Thu, 2003-06-26 at 07:41, Radek Doulík wrote:
> On Thu, 2003-06-26 at 06:58, Larry Ewing wrote:
> > 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.
> 
> Looks good.
> 
> (I would prefer to dup not the fixed_family, but it doesn't matter)
> 
> 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches

? autom4te.cache
? gtkhtml-3.0.6.tar.gz
? memprof-evo2.leak
? stamp-h1
? components/html-editor/test_editor
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/ChangeLog,v
retrieving revision 1.235
diff -u -p -r1.235 ChangeLog
--- ChangeLog	27 May 2003 04:41:48 -0000	1.235
+++ ChangeLog	26 Jun 2003 12:44:10 -0000
@@ -1,3 +1,7 @@
+2003-06-26  Larry Ewing  <lewing ximian com>
+
+	* configure.in: bump versions for release.
+
 2003-05-27  Dmitry G. Mastrukov  <dmitry taurussoft org>
 
 	* configure.in: Added Belarusian to ALL_LINGUAS.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/configure.in,v
retrieving revision 1.215
diff -u -p -r1.215 configure.in
--- configure.in	2 Jun 2003 19:11:47 -0000	1.215
+++ configure.in	26 Jun 2003 12:44:10 -0000
@@ -24,7 +24,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 GNOME_EXPLICIT_TRANSLATION_DOMAIN=${GTKHTML_RELEASE_STRING}
 AC_DEFINE_UNQUOTED(GNOME_EXPLICIT_TRANSLATION_DOMAIN, "${GNOME_EXPLICIT_TRANSLATION_DOMAIN}", [Gnome Explicit Translation Domain])
 
-AM_INIT_AUTOMAKE($PACKAGE, $GTKHTML_RELEASE.5)
+AM_INIT_AUTOMAKE($PACKAGE, $GTKHTML_RELEASE.6)
 
 EDITOR_API_VERSION=3.0
 AC_DEFINE_UNQUOTED(EDITOR_API_VERSION, "${EDITOR_API_VERSION}", [Editor API Version])
@@ -113,7 +113,7 @@ dnl **********************************
  
 dnl Increment the following if the interface has additions, changes,
 dnl removals.
-GTKHTML_CURRENT=2
+GTKHTML_CURRENT=3
 
 dnl Increment any time the source changes; set to 0 if you
 dnl increment CURRENT.
@@ -122,7 +122,7 @@ GTKHTML_REVISION=0
 dnl Increment if any interfaces have been added; set to 0
 dnl if any interfaces have been removed. removal has 
 dnl precedence over adding, so set to 0 if both happened.
-GTKHTML_AGE=0
+GTKHTML_AGE=1
 
 AC_SUBST(GTKHTML_CURRENT)
 AC_SUBST(GTKHTML_REVISION)
Index: components/html-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile.am
--- components/html-editor/Makefile.am	13 Jun 2003 17:03:22 -0000	1.88
+++ components/html-editor/Makefile.am	26 Jun 2003 12:44:10 -0000
@@ -193,12 +193,11 @@ EXTRA_DIST =					\
 idldir = $(gtkhtml_data)
 idl_DATA = $(IDLS)
 
-CLEANFILES = \
-	GNOME_GtkHTML_Editor.xml		\
-	$(IDL_GENERATED)			\
-	$(SPELL_IDL_GENERATED) 
-
-BUILT_SOURCE = $(IDL_GENERATED) $(SPELL_IDL_GENERATED)
-
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
+
+BUILT_SOURCES = $(IDL_GENERATED) $(SPELL_IDL_GENERATED) $(server_DATA)
+
+CLEANFILES = \
+	GNOME_GtkHTML_Editor.xml		\
+	$(BUILT_SOURCES)
Index: src/gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.518
diff -u -p -r1.518 gtkhtml.c
--- src/gtkhtml.c	25 Jun 2003 18:15:46 -0000	1.518
+++ src/gtkhtml.c	26 Jun 2003 12:44:11 -0000
@@ -725,12 +725,12 @@ gtk_html_set_fonts (GtkHTML *html, HTMLP
 {
 	PangoFontDescription *fixed_desc = NULL;
 	char *fixed_name = NULL;
-	char *fixed_family = NULL;
+	const char *fixed_family = NULL;
 	gint  fixed_size = 0;
-	char *font_var = NULL;
+	const char *font_var = NULL;
 	gint  font_var_size = 0;
 
-	(const gchar *) font_var = pango_font_description_get_family (GTK_WIDGET (html)->style->font_desc);
+	font_var = pango_font_description_get_family (GTK_WIDGET (html)->style->font_desc);
 	font_var_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET (html)->style->font_desc));
 		
 	gtk_widget_style_get (GTK_WIDGET (html), "fixed_font_name", &fixed_name, NULL);
@@ -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 = pango_font_description_get_family (fixed_desc);
 		} else {
 			g_free (fixed_name);
 			fixed_name = NULL;
@@ -746,19 +746,18 @@ gtk_html_set_fonts (GtkHTML *html, HTMLP
 	}
 		
 	if (!fixed_name) {
-		fixed_family = g_strdup ("Monospace");
+		fixed_family = "Monospace";
 		fixed_size = font_var_size;
 	}
 
 	html_font_manager_set_default (&painter->font_manager,
-				       font_var, fixed_family,
+				       (char *)font_var, (char *)fixed_family,
 				       font_var_size, FALSE,
 				       fixed_size, FALSE);
 	if (fixed_desc)
 		pango_font_description_free (fixed_desc);
 
 	g_free (fixed_name);
-	g_free (fixed_family);
 }
 
 /* GtkWidget methods.  */
Index: src/htmlimage.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlimage.c,v
retrieving revision 1.187
diff -u -p -r1.187 htmlimage.c
--- src/htmlimage.c	21 May 2003 15:21:22 -0000	1.187
+++ src/htmlimage.c	26 Jun 2003 12:44:12 -0000
@@ -1284,6 +1284,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 +1306,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);