aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--my-evolution/ChangeLog7
-rw-r--r--my-evolution/e-summary-rdf.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index c4bdf569a0..ef383c0cc3 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-19 Dan Winship <danw@ximian.com>
+
+ * e-summary-rdf.c: Declare xmlSubstituteEntitiesDefaultValue
+ extern.
+ (message_finished): And set its value here. Fixes a duplicate
+ symbol error on OS X.
+
2003-02-10 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Split the IDL generated rules so ${ORBIT_IDL}
diff --git a/my-evolution/e-summary-rdf.c b/my-evolution/e-summary-rdf.c
index 34d211a689..4a3145849d 100644
--- a/my-evolution/e-summary-rdf.c
+++ b/my-evolution/e-summary-rdf.c
@@ -63,7 +63,7 @@ typedef struct _RDF {
SoupMessage *message;
} RDF;
-int xmlSubstituteEntitiesDefaultValue = 1;
+extern int xmlSubstituteEntitiesDefaultValue;
char *
e_summary_rdf_get_html (ESummary *summary)
@@ -342,6 +342,7 @@ message_finished (SoupMessage *msg,
r->cache = NULL;
}
+ xmlSubstituteEntitiesDefaultValue = 1;
doc = xmlParseMemory (msg->response.body, msg->response.length);
r->cache = doc;
r->message = NULL;