Merging patches from 1-0-branch

svn path=/trunk/; revision=15109

1 files changed, 47 insertions, 0 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index fcb3be5000..2fccd50181 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,50 @@
+2001-12-14  Iain Holmes  <iain@ximian.com>
+
+	* Location-translation-script: shell script to convert Locations to
+	Locations.h
+
+	* Locations.h: Translatable file for the weather stations.
+
+	* Makefile.am: Add these files to the dist.
+
+2001-12-14  Iain Holmes  <iain@ximian.com>
+
+	* metar.c: Remove the degree symbol.
+
+2001-12-14  Iain Holmes  <iain@ximian.com>
+
+	* e-summary.c (e_summary_init): Create a translatable string for the
+	default HTML, that says "Please wait..."
+
+2001-12-14  Iain Holmes  <iain@ximian.com>
+
+	* e-summary.c (e_summary_freeze): Check that priv != NULL
+	(e_summary_thaw): Check that priv != NULL
+	(e_summary_count_connections): Check that summary is a Summary.
+	(e_summary_add_connections): Check that the summary is a Summary.
+	(e_summary_set_online): Check that the summary is a Summary.
+
+	* e-summary-offline-handler.c (impl__get_isOffline): Only check
+	summary if it's not NULL.
+	(impl_prepareForOffline): Ditto.
+	(impl_goOnline): Only go online if summary isn't NULL.
+
+2001-12-13  Iain Holmes  <iain@ximian.com>
+
+	* e-summary-calendar.c (generate_html): Check that text.value isn't
+	NULL.
+
+2001-12-10  Iain Holmes  <iain@ximian.com>
+
+	* e-summary-rdf.c (e_summary_rdf_init): Set the initial sites to
+	Linux Today and Salon.
+
+	* e-summary-preferences.c (make_initial_rdf_list): Ditto
+
+2001-12-10  Iain Holmes  <iain@ximian.com>
+
+	* e-summary-calendar.c (generate_html): Apply damon's change.
+
 2001-12-06  Iain Holmes  <iain@ximian.com>
 
 	* e-summary-preferences.c (rdfs): Remove the perl.com one.