[evolution-patches] a new patch against #70871

[Mengjie Yu <Meng-Jie Yu Sun COM>]

hi,rodo

     This patch is against Patch a11y-image.diff I had commit into CVS
Head on Dec 28th.  According to  menthos's opinion, we should not split
sentence in gtkhtml, so I made this patch. 


    It is very very Small. Will you please review it ? Thanks a lot.

Cheers,
Mengjie yu

-- 
Mengjie Yu <meng-jie yu sun com>
meng-jie yu sun com

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/a11y/ChangeLog,v
retrieving revision 1.16
diff -u -p -r1.16 ChangeLog
--- ChangeLog	29 Dec 2004 11:34:33 -0000	1.16
+++ ChangeLog	5 Jan 2005 09:18:41 -0000
@@ -1,3 +1,9 @@
+2005-01-05  Mengjie Yu  <meng-jie yu sun com>
+
+	Fixes #70871
+	* image.c: (html_a11y_image_get_name):
+	Don't split sentence in gtkhtml.
+
 2004-12-29  Mengjie Yu  <meng-jie yu sun com>
 
 	* image.c: (html_a11y_image_get_name),
Index: image.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/a11y/image.c,v
retrieving revision 1.3
diff -u -p -r1.3 image.c
--- image.c	29 Dec 2004 11:34:33 -0000	1.3
+++ image.c	5 Jan 2005 09:18:47 -0000
@@ -141,18 +141,15 @@ static G_CONST_RETURN gchar *
 html_a11y_image_get_name (AtkObject *accessible)
 {
 	HTMLImage *img = HTML_IMAGE (HTML_A11Y_HTML (accessible));
-	gchar *name, *tmpName;
+	gchar *name;
 
 	if (accessible->name)
 		return accessible->name;
 
-	tmpName = g_strconcat (_("URL is "), img->image_ptr->url, NULL);
-
 	if (img->alt) {
-		name = g_strconcat (tmpName, _(", Alternative Text is "), img->alt, NULL);
-		g_free (tmpName);
+		name = g_strdup_printf (_("URL is %s, Alternative Text is %s"), img->image_ptr->url, img->alt);
 	} else
-		name = tmpName;
+		name = g_strdup_printf (_("URL is %s"), img->image_ptr->url);
 
 	atk_object_set_name (accessible, name);
 	g_free (name);