[Xfce4-commits] <xfce4-weather-plugin:master> No "sun" for Solaris (bug #9185).

[Harald Judt]

Updating branch refs/heads/master
         to 6a395f4829d7adbffa75e6abf62b0fa0df6e9e81 (commit)
       from d366a6b2d616f72d3848a40c2fb7d1d9b80e1307 (commit)

commit 6a395f4829d7adbffa75e6abf62b0fa0df6e9e81
Author: Harald Judt <h.judt at gmx.at>
Date:   Tue Aug 7 11:01:39 2012 +0200

    No "sun" for Solaris (bug #9185).
    
    "sun" is reserved on Solaris, so use something else.

 panel-plugin/weather.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index c1b5c11..8b6951e 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -891,7 +891,7 @@ weather_get_tooltip_text(const xfceweather_data *data)
     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, *sunval, *value;
     gchar sunrise[40], sunset[40];
     gchar point[40], interval_start[40], interval_end[40];
     const gchar *unit;
@@ -913,19 +913,19 @@ weather_get_tooltip_text(const xfceweather_data *data)
     /* use sunrise and sunset times if available */
     if (data->astrodata)
         if (data->astrodata->sun_never_rises) {
-            sun = g_strdup(_("The sun never rises today."));
+            sunval = g_strdup(_("The sun never rises today."));
         } else if (data->astrodata->sun_never_sets) {
-            sun = g_strdup(_("The sun never sets today."));
+            sunval = 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."),
+            sunval = g_strdup_printf(_("The sun rises at %s and sets at %s."),
                                   sunrise, sunset);
         }
     else
-        sun = g_strdup_printf("");
+        sunval = g_strdup_printf("");
 
     sym = get_data(conditions, data->unit_system, SYMBOL);
     DATA_AND_UNIT(symbol, SYMBOL);
@@ -972,8 +972,8 @@ weather_get_tooltip_text(const xfceweather_data *data)
          windspeed, windbeau, winddir, winddeg,
          pressure, humidity,
          fog, cloudiness,
-         sun);
-    g_free(sun);
+         sunval);
+    g_free(sunval);
     g_free(sym);
     g_free(symbol);
     g_free(alt);