diff options
| -rw-r--r-- | my-evolution/ChangeLog | 11 | ||||
| -rw-r--r-- | my-evolution/e-summary-factory.c | 2 | ||||
| -rw-r--r-- | my-evolution/e-summary-rdf.c | 2 | ||||
| -rw-r--r-- | my-evolution/e-summary-weather.c | 3 |
4 files changed, 14 insertions, 4 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index beae68e449..f1dadef2bc 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,14 @@ +2003-07-23 Dan Winship <danw@ximian.com> + + * e-summary-factory.c (e_summary_factory_new_control): Fix a + warning. + + * e-summary-rdf.c (tree_walk): Fix a warning + + * e-summary-weather.c (e_summary_weather_get_html): Remove an + unused variable. + (weather_make_html): Likewise. + 2003-06-23 Dan Winship <danw@ximian.com> * e-summary-calendar.c (setup_gconf_client): Don't call diff --git a/my-evolution/e-summary-factory.c b/my-evolution/e-summary-factory.c index 6ebaf06e4f..3637d358e4 100644 --- a/my-evolution/e-summary-factory.c +++ b/my-evolution/e-summary-factory.c @@ -125,7 +125,7 @@ e_summary_factory_new_control (const char *uri, return NULL; } - e_summary_set_control (summary, control); + e_summary_set_control (E_SUMMARY (summary), control); g_signal_connect (control, "activate", G_CALLBACK (control_activate_cb), summary); g_signal_connect (control, "destroy", G_CALLBACK (control_destroy_cb), summary); diff --git a/my-evolution/e-summary-rdf.c b/my-evolution/e-summary-rdf.c index e49d5d008f..cfd3b74d29 100644 --- a/my-evolution/e-summary-rdf.c +++ b/my-evolution/e-summary-rdf.c @@ -194,7 +194,7 @@ tree_walk (xmlNodePtr root, charset = NULL; } else { /* bad/missing encoding, fallback to latin1 (locale?) */ - charset = r->cache->encoding ? r->cache->encoding : "iso-8859-1"; + charset = r->cache->encoding ? (char *)r->cache->encoding : "iso-8859-1"; } /* FIXME: Need arrows */ diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c index d0101e1fec..53b5be12b6 100644 --- a/my-evolution/e-summary-weather.c +++ b/my-evolution/e-summary-weather.c @@ -61,7 +61,6 @@ e_summary_weather_get_html (ESummary *summary) GList *weathers; GString *string; char *html; - char *s; if (summary->weather == NULL || summary->weather->weathers == NULL) { return NULL; @@ -100,7 +99,7 @@ weather_make_html (Weather *w) { GString *string; ESummaryWeatherLocation *location; - char *sky, *temp, *cond, *s; + char *sky, *temp, *cond; const char *icon_name; icon_name = icon_from_weather (w); |