summaryrefslogtreecommitdiff
path: root/gweather
diff options
context:
space:
mode:
authorCallum McKenzie <callum@src.gnome.org>2009-03-19 23:33:42 +0000
committerCallum McKenzie <callum@src.gnome.org>2009-03-19 23:33:42 +0000
commit4f399666321a8fb4e0a9b871e76e50be07af253e (patch)
tree68ffbe96e67ac1bc72879bd0e6cfdc36123f9478 /gweather
parent2e6a6aa8afde5365579a0a2053948249ed5cab22 (diff)
Patch from gQuigs to replace g_timeout_add
with g_timeout_add_seconds where appropriate. Bug 57360. svn path=/trunk/; revision=11390
Diffstat (limited to 'gweather')
-rw-r--r--gweather/ChangeLog6
-rw-r--r--gweather/gweather-applet.c6
-rw-r--r--gweather/gweather-pref.c10
3 files changed, 14 insertions, 8 deletions
diff --git a/gweather/ChangeLog b/gweather/ChangeLog
index 5f5139e02..e15ebb8dd 100644
--- a/gweather/ChangeLog
+++ b/gweather/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-20 Callum McKenzie <callum@spooky-possum.org>
+
+ * gweather-pref.c:
+ * gweather-applet.c: Patch from gQuigs to replace g_timeout_add
+ with g_timeout_add_seconds where appropriate. Bug 57360.
+
==================== 2.26.0 ======================
2009-03-06 Philip Withnall <philip@tecnocode.co.uk>
diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c
index 4e38b0e85..101d64fb2 100644
--- a/gweather/gweather-applet.c
+++ b/gweather/gweather-applet.c
@@ -398,14 +398,14 @@ update_finish (WeatherInfo *info, gpointer data)
if (gw_applet->gweather_pref.update_enabled)
{
gw_applet->timeout_tag =
- g_timeout_add (
- gw_applet->gweather_pref.update_interval * 1000,
+ g_timeout_add_seconds (
+ gw_applet->gweather_pref.update_interval,
timeout_cb, gw_applet);
nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info);
if (nxtSunEvent >= 0)
gw_applet->suncalc_timeout_tag =
- g_timeout_add (nxtSunEvent * 1000,
+ g_timeout_add_seconds (nxtSunEvent,
suncalc_timeout_cb, gw_applet);
}
diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c
index 844170b06..d0e20fc7b 100644
--- a/gweather/gweather-pref.c
+++ b/gweather/gweather-pref.c
@@ -344,13 +344,13 @@ auto_update_toggled (GtkToggleButton *button, GWeatherPref *pref)
if (gw_applet->suncalc_timeout_tag > 0)
g_source_remove(gw_applet->suncalc_timeout_tag);
if (gw_applet->gweather_pref.update_enabled) {
- gw_applet->timeout_tag = g_timeout_add (
- gw_applet->gweather_pref.update_interval * 1000,
+ gw_applet->timeout_tag = g_timeout_add_seconds (
+ gw_applet->gweather_pref.update_interval,
timeout_cb, gw_applet);
nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info);
if (nxtSunEvent >= 0)
- gw_applet->suncalc_timeout_tag = g_timeout_add (
- nxtSunEvent * 1000,
+ gw_applet->suncalc_timeout_tag = g_timeout_add_seconds (
+ nxtSunEvent,
suncalc_timeout_cb,
gw_applet);
}
@@ -548,7 +548,7 @@ update_interval_changed (GtkSpinButton *button, GWeatherPref *pref)
g_source_remove(gw_applet->timeout_tag);
if (gw_applet->gweather_pref.update_enabled)
gw_applet->timeout_tag =
- g_timeout_add (gw_applet->gweather_pref.update_interval * 1000,
+ g_timeout_add_seconds (gw_applet->gweather_pref.update_interval,
timeout_cb, gw_applet);
}