diff options
Diffstat (limited to 'applets/clock')
| -rw-r--r-- | applets/clock/clock-location.c | 5 | ||||
| -rw-r--r-- | applets/clock/system-timezone.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c index 9b4c882d..13495587 100644 --- a/applets/clock/clock-location.c +++ b/applets/clock/clock-location.c @@ -66,7 +66,7 @@ static guint location_signals[LAST_SIGNAL] = { 0 }; static void clock_location_finalize (GObject *); static void clock_location_set_tz (ClockLocation *this); static void clock_location_unset_tz (ClockLocation *this); -static gboolean update_weather_info (ClockLocation *loc); +static gboolean update_weather_info (gpointer data); static void setup_weather_updates (ClockLocation *loc); static gchar *clock_location_get_valid_weather_code (const gchar *code); @@ -680,8 +680,9 @@ weather_info_updated (WeatherInfo *info, gpointer data) } static gboolean -update_weather_info (ClockLocation *loc) +update_weather_info (gpointer data) { + ClockLocation *loc = (ClockLocation *) data; ClockLocationPrivate *priv = PRIVATE (loc); WeatherPrefs prefs = { FORECAST_STATE, diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c index b736ffee..d3745e3d 100644 --- a/applets/clock/system-timezone.c +++ b/applets/clock/system-timezone.c @@ -877,7 +877,6 @@ system_timezone_is_zone_file_valid (const char *zone_file, { GError *our_error; GIOChannel *channel; - GIOStatus status; char buffer[strlen (TZ_MAGIC)]; gsize read; @@ -904,9 +903,9 @@ system_timezone_is_zone_file_valid (const char *zone_file, our_error = NULL; channel = g_io_channel_new_file (zone_file, "r", &our_error); if (!our_error) - status = g_io_channel_read_chars (channel, - buffer, strlen (TZ_MAGIC), - &read, &our_error); + g_io_channel_read_chars (channel, + buffer, strlen (TZ_MAGIC), + &read, &our_error); if (channel) g_io_channel_unref (channel); |