[evolution-patches] Please review my patch for bug #43484

[Antonio Xu <antonio xu sun com>]

Hello All,
             Could you review my patch for bug #43484?
             Bug Summary:Build Evolution error in my-evolution 
directory(May 22 trunk)
             Bug Description: When building evolution (May 22 trunk) on 
Solaris 8/9 with Forte, system report errors. It is due to Forte didn't 
support this kind of assigning value,see the source code below.
             char *a = is_true? "123":"456";

Thanks
Antonio Xu

Index: my-evolution/e-summary-rdf.c
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/e-summary-rdf.c,v
retrieving revision 1.40
diff -u -r1.40 e-summary-rdf.c
--- my-evolution/e-summary-rdf.c	5 May 2003 01:03:56 -0000	1.40
+++ my-evolution/e-summary-rdf.c	22 May 2003 09:07:56 -0000
@@ -194,7 +194,10 @@
 		charset = NULL;
 	} else {
 		/* bad/missing encoding, fallback to latin1 (locale?) */
-		charset = r->cache->encoding ? r->cache->encoding : "iso-8859-1";
+		if (r->cache->encoding)
+			charset = r->cache->encoding;
+		else	       
+			charset = "iso-8859-1";
 	}
 
 	/* FIXME: Need arrows */
Index: my-evolution/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/ChangeLog,v
retrieving revision 1.288
diff -u -r1.288 ChangeLog
--- my-evolution/ChangeLog	19 May 2003 15:24:01 -0000	1.288
+++ my-evolution/ChangeLog	22 May 2003 09:21:39 -0000
@@ -1,3 +1,7 @@
+2003-05-22  Antonio Xu <antonio xu sun com>
+	* e-summary-rdf.c (tree_walk): Change some codes to avoid building
+	error. Fix bug #43484.
+
 2003-05-19  Anna Marie Dirks  <anna ximian com>
 
 	* e-summary-preferences.c: This patch HIG-ifies the "New News Feed"