diff options
| -rw-r--r-- | my-evolution/ChangeLog | 7 | ||||
| -rw-r--r-- | my-evolution/e-summary-preferences.c | 21 | ||||
| -rw-r--r-- | my-evolution/e-summary-weather.c | 17 | ||||
| -rw-r--r-- | my-evolution/my-evolution.glade | 8 | ||||
| -rw-r--r-- | my-evolution/weather.h | 1 |
5 files changed, 40 insertions, 14 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 66b5df05ef..5be69260a0 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,5 +1,12 @@ 2001-07-03 Iain Holmes <iain@ximian.com> + * e-summary-prefences.c (e_summary_preferences_restore): Disabled until + memory corruption thing is found. + + * my-evolution.glade: Fix the radio button problem. + +2001-07-03 Iain Holmes <iain@ximian.com> + * e-summary-factory.c: Fixed the Bonobo warning. 2001-07-03 Iain Holmes <iain@ximian.com> diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c index 1012609fc4..44c5b49fdb 100644 --- a/my-evolution/e-summary-preferences.c +++ b/my-evolution/e-summary-preferences.c @@ -114,6 +114,7 @@ str_list_from_vector (const char *vector) gboolean e_summary_preferences_restore (ESummaryPrefs *prefs) { +#if 0 Bonobo_ConfigDatabase db; CORBA_Environment ev; char *vector; @@ -135,9 +136,9 @@ e_summary_preferences_restore (ESummaryPrefs *prefs) return FALSE; } prefs->display_folders = str_list_from_vector (vector); - g_free (vector); + g_free (vector); - prefs->show_full_path = bonobo_config_get_boolean (db, "Mail/show_full_path=FALSE", NULL); + prefs->show_full_path = bonobo_config_get_boolean (db, "Mail/show_full_path", NULL); vector = bonobo_config_get_string (db, "RDF/rdf_urls", NULL); if (vector == NULL) { @@ -145,7 +146,7 @@ e_summary_preferences_restore (ESummaryPrefs *prefs) return FALSE; } prefs->rdf_urls = str_list_from_vector (vector); - g_free (vector); + g_free (vector); prefs->rdf_refresh_time = bonobo_config_get_long_with_default (db, "RDF/rdf_refresh_time", 600, NULL); prefs->limit = bonobo_config_get_long_with_default (db, "RDF/limit", 10, NULL); @@ -157,16 +158,18 @@ e_summary_preferences_restore (ESummaryPrefs *prefs) return FALSE; } prefs->stations = str_list_from_vector (vector); - g_free (vector); + g_free (vector); prefs->units = bonobo_config_get_long (db, "Weather/units", NULL); - prefs->weather_refresh_time = bonobo_config_get_long (db, "weather_refresh_time", NULL); + prefs->weather_refresh_time = bonobo_config_get_long (db, "Weather/weather_refresh_time", NULL); prefs->days = bonobo_config_get_long (db, "Schedule/days", NULL); - prefs->show_tasks = bonobo_config_get_long (db, "show_tasks", NULL); + prefs->show_tasks = bonobo_config_get_long (db, "Schedule/show_tasks", NULL); bonobo_object_release_unref (db, NULL); return TRUE; +#endif + return FALSE; } /* Write prefs to disk */ @@ -190,13 +193,13 @@ e_summary_preferences_save (ESummaryPrefs *prefs) vector = vector_from_str_list (prefs->display_folders); bonobo_config_set_string (db, "Mail/display_folders", vector, NULL); - g_free (vector); + g_free (vector); bonobo_config_set_boolean (db, "Mail/show_full_path", prefs->show_full_path, NULL); vector = vector_from_str_list (prefs->rdf_urls); bonobo_config_set_string (db, "RDF/rdf_urls", vector, NULL); - g_free (vector); + g_free (vector); bonobo_config_set_long (db, "RDF/rdf_refresh_time", prefs->rdf_refresh_time, NULL); bonobo_config_set_long (db, "RDF/limit", prefs->limit, NULL); @@ -204,7 +207,7 @@ e_summary_preferences_save (ESummaryPrefs *prefs) vector = vector_from_str_list (prefs->stations); bonobo_config_set_string (db, "Weather/stations", vector, NULL); - g_free (vector); + g_free (vector); bonobo_config_set_long (db, "Weather/units", prefs->units, NULL); bonobo_config_set_long (db, "Weather/weather_refresh_time", prefs->weather_refresh_time, NULL); diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c index 8f97c813c1..164278fe50 100644 --- a/my-evolution/e-summary-weather.c +++ b/my-evolution/e-summary-weather.c @@ -324,6 +324,18 @@ e_summary_weather_update (ESummary *summary) } static void +weather_free (Weather *w) +{ + g_return_if_fail (w != NULL); + + if (w->handle != NULL) { + gnome_vfs_async_cancel (w->handle); + } + g_free (w->location); + g_free (w->html); + g_free (w); +} +static void e_summary_weather_add_location (ESummary *summary, const char *location) { @@ -701,10 +713,7 @@ e_summary_weather_reconfigure (ESummary *summary) Weather *w; w = old->data; - g_free (w->location); - g_free (w->html); - g_free (w->metar); - g_free (w); + weather_free (w); } g_list_free (weather->weathers); weather->weathers = NULL; diff --git a/my-evolution/my-evolution.glade b/my-evolution/my-evolution.glade index 5093984ca7..38c5c88992 100644 --- a/my-evolution/my-evolution.glade +++ b/my-evolution/my-evolution.glade @@ -1095,6 +1095,7 @@ <label>metric</label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>units_group</group> <child> <padding>0</padding> <expand>False</expand> @@ -1109,6 +1110,7 @@ <label>imperial</label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>units_group</group> <child> <padding>0</padding> <expand>False</expand> @@ -1250,6 +1252,7 @@ <label></label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>day_group</group> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1273,6 +1276,7 @@ <label></label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>day_group</group> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1296,6 +1300,7 @@ <label></label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>day_group</group> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1319,6 +1324,7 @@ <label></label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>day_group</group> <child> <left_attach>0</left_attach> <right_attach>1</right_attach> @@ -1548,6 +1554,7 @@ <label>Show all tasks</label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>tasks_group</group> <child> <padding>0</padding> <expand>False</expand> @@ -1562,6 +1569,7 @@ <label>Show today's tasks</label> <active>False</active> <draw_indicator>True</draw_indicator> + <group>tasks_group</group> <child> <padding>0</padding> <expand>False</expand> diff --git a/my-evolution/weather.h b/my-evolution/weather.h index bbb7b5e863..f94dd64538 100644 --- a/my-evolution/weather.h +++ b/my-evolution/weather.h @@ -16,7 +16,6 @@ typedef struct _Weather { char *location; char *html; - char *metar; GnomeVFSAsyncHandle *handle; GString *string; char *buffer; |