--- xfce4-weather-plugin-0.8.1.broken/panel-plugin/weather.c Mon Aug 6 10:52:09 2012 +++ xfce4-weather-plugin-0.8.1/panel-plugin/weather.c Mon Aug 6 22:02:40 2012 @@ -891,7 +891,7 @@ gchar *text, *sym, *symbol, *alt, *lat, *lon, *temp; gchar *windspeed, *windbeau, *winddir, *winddeg; gchar *pressure, *humidity, *precipitations; - gchar *fog, *cloudiness, *sun, *value; + gchar *fog, *cloudiness, *sunny, *value; gchar sunrise[40], sunset[40]; gchar point[40], interval_start[40], interval_end[40]; const gchar *unit; @@ -913,19 +913,19 @@ /* use sunrise and sunset times if available */ if (data->astrodata) if (data->astrodata->sun_never_rises) { - sun = g_strdup(_("The sun never rises today.")); + sunny = g_strdup(_("The sun never rises today.")); } else if (data->astrodata->sun_never_sets) { - sun = g_strdup(_("The sun never sets today.")); + sunny = g_strdup(_("The sun never sets today.")); } else { sunrise_tm = localtime(&data->astrodata->sunrise); strftime(sunrise, 40, "%X", sunrise_tm); sunset_tm = localtime(&data->astrodata->sunset); strftime(sunset, 40, "%X", sunset_tm); - sun = g_strdup_printf(_("The sun rises at %s and sets at %s."), + sunny = g_strdup_printf(_("The sun rises at %s and sets at %s."), sunrise, sunset); } else - sun = g_strdup_printf(""); + sunny = g_strdup_printf(""); sym = get_data(conditions, data->unit_system, SYMBOL); DATA_AND_UNIT(symbol, SYMBOL);