Save the RDFs into a new place

Only have one place for initialisation of rdf/weather stations.

svn path=/trunk/; revision=14362

4 files changed, 29 insertions, 24 deletions

diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 9430d0c3e8..e87bf4900e 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,20 @@
+2001-10-29  Iain Holmes  <iain@ximian.com>
+
+	* e-summary-preferences.c (make_initial_rdf_list): Set list to NULL.
+	(make_initial_weather_list): Set list to NULL.
+
+	* e-summary-weather.c (e_summary_weather_init): Check if the prefs are
+	NULL or if the weather stations are NULL.
+
+	* e-summary-rdf.c (e_summary_rdf_init): Check if the prefs or the list
+	of news feeds is NULL.
+
+2001-10-29  Iain Holmes  <iain@ximian.com>
+
+	* e-summary-preferences.c (fill_rdf_all_clist): Open the new location.
+	If it doesn't exist try the old location.
+	(save_known_rdfs): Save to the new location.
+
 2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
 
 	* e-summary-calendar.c (e_summary_calendar_init): retrieve the
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index 8e1b590af9..e4d781deb2 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -62,31 +62,13 @@ make_initial_mail_list (ESummaryPrefs *prefs)
 static void
 make_initial_rdf_list (ESummaryPrefs *prefs)
 {
-	GList *rdfs;
-
-	rdfs = g_list_prepend (NULL, g_strdup ("http://news.gnome.org/gnome-news/rdf"));
-
-	prefs->rdf_urls = rdfs;
+	prefs->rdf_urls = NULL;
 }
 
 static void
 make_initial_weather_list (ESummaryPrefs *prefs)
 {
-	/* translators: Put here a list of codes for locations you want to
-	   see in My Evolution by default. You can find the list of all
-	   stations and their codes in Evolution sources
-	   (evolution/my-evolution/Locations) */
-	char *default_stations = _("KBOS"), **stations_v, **p;
-	GList *stations = NULL;
-
-	stations_v = g_strsplit (default_stations, ":", 0);
-	g_assert (stations_v != NULL);
-	for (p = stations_v; *p != NULL; p++) {
-		stations = g_list_prepend (stations, *p);
-	}
-	g_free (stations_v);
-
-	prefs->stations = g_list_reverse (stations);
+	prefs->stations = NULL;
 }
 
 /* Load the prefs off disk */
@@ -501,7 +483,7 @@ save_known_rdfs (GList *rdfs)
 	FILE *handle;
 	char *rdf_file;
 
-	rdf_file = gnome_util_prepend_user_home ("evolution/config/RDF-urls.txt");
+	rdf_file = gnome_util_prepend_user_home ("evolution/RDF-urls.txt");
 	handle = fopen (rdf_file, "w");
 	g_free (rdf_file);
 
@@ -531,9 +513,15 @@ fill_rdf_all_clist (GtkCList *clist,
 	int i;
 	char *rdf_file, line[4096];
 
-	rdf_file = gnome_util_prepend_user_home ("evolution/config/RDF-urls.txt");
+	rdf_file = gnome_util_prepend_user_home ("evolution/RDF-urls.txt");
 	handle = fopen (rdf_file, "r");
 	g_free (rdf_file);
+	if (handle == NULL) {
+		/* Open the old location just so that users data isn't lost */
+		rdf_file = gnome_util_prepend_user_home ("evolution/config/RDF-urls.txt");
+		handle = fopen (rdf_file, "r");
+		g_free (rdf_file);
+	}
 
 	if (handle == NULL) {
 		for (i = 0; rdfs[i].url; i++) {
diff --git a/my-evolution/e-summary-rdf.c b/my-evolution/e-summary-rdf.c
index 7fab2f8957..9981e09198 100644
--- a/my-evolution/e-summary-rdf.c
+++ b/my-evolution/e-summary-rdf.c
@@ -640,7 +640,7 @@ e_summary_rdf_init (ESummary *summary)
 	e_summary_add_online_connection (summary, connection);
 
 	e_summary_add_protocol_listener (summary, "rdf", e_summary_rdf_protocol, rdf);
-	if (prefs == NULL) {
+	if (prefs == NULL || prefs->rdf_urls == NULL) {
 		e_summary_rdf_add_uri (summary, "http://www.cnn.com/cnn.rss");
 		timeout = 600;
 	} else {
diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c
index 2787989277..e057584534 100644
--- a/my-evolution/e-summary-weather.c
+++ b/my-evolution/e-summary-weather.c
@@ -653,7 +653,7 @@ e_summary_weather_init (ESummary *summary)
 
 	e_summary_add_protocol_listener (summary, "weather", e_summary_weather_protocol, weather);
 
-	if (prefs == NULL) {
+	if (prefs == NULL || prefs->stations == NULL) {
 		/* translators: Put here a list of codes for locations you want to
 		   see in My Evolution by default. You can find the list of all
 		   stations and their codes in Evolution sources