[Xfce4-commits] <xfce4-weather-plugin:master> Rename updatetimeout to update_timer.

[Harald Judt]

Updating branch refs/heads/master
         to d022129310cbf78302b685b121cafcf1508b252d (commit)
       from 0b55123b9983893514b5838c6f4b72c584eff97a (commit)

commit d022129310cbf78302b685b121cafcf1508b252d
Author: Harald Judt <h.judt at gmx.at>
Date:   Wed Dec 12 15:18:19 2012 +0100

    Rename updatetimeout to update_timer.

 panel-plugin/weather-config.c |    6 +++---
 panel-plugin/weather.c        |   22 +++++++++++-----------
 panel-plugin/weather.h        |    2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 523ad8b..e1ead51 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -166,9 +166,9 @@ schedule_delayed_data_update(xfceweather_dialog *dialog)
     }
 
     /* stop any updates that could be performed by weather.c */
-    if (dialog->pd->updatetimeout) {
-        g_source_remove(dialog->pd->updatetimeout);
-        dialog->pd->updatetimeout = 0;
+    if (dialog->pd->update_timer) {
+        g_source_remove(dialog->pd->update_timer);
+        dialog->pd->update_timer = 0;
     }
 
     gtk_widget_show(GTK_WIDGET(dialog->update_spinner));
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 7016be5..71f7ec8 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -393,7 +393,7 @@ need_astro_update(const plugin_data *data)
     time_t now_t;
     struct tm now_tm, last_tm;
 
-    if (!data->updatetimeout || !data->last_astro_update)
+    if (!data->update_timer || !data->last_astro_update)
         return TRUE;
 
     time(&now_t);
@@ -412,7 +412,7 @@ need_data_update(const plugin_data *data)
     time_t now_t;
     gint diff;
 
-    if (!data->updatetimeout || !data->last_data_update)
+    if (!data->update_timer || !data->last_data_update)
         return TRUE;
 
     time(&now_t);
@@ -430,7 +430,7 @@ need_conditions_update(const plugin_data *data)
     time_t now_t;
     struct tm now_tm;
 
-    if (!data->updatetimeout || !data->last_conditions_update)
+    if (!data->update_timer || !data->last_conditions_update)
         return TRUE;
 
     time(&now_t);
@@ -1006,9 +1006,9 @@ update_weatherdata_with_reset(plugin_data *data, gboolean clear)
     if (G_UNLIKELY(data == NULL))
         return;
 
-    if (data->updatetimeout) {
-        g_source_remove(data->updatetimeout);
-        data->updatetimeout = 0;
+    if (data->update_timer) {
+        g_source_remove(data->update_timer);
+        data->update_timer = 0;
     }
 
     memset(&data->last_data_update, 0, sizeof(data->last_data_update));
@@ -1027,7 +1027,7 @@ update_weatherdata_with_reset(plugin_data *data, gboolean clear)
 
     update_weatherdata(data);
 
-    data->updatetimeout =
+    data->update_timer =
         g_timeout_add_seconds(UPDATE_INTERVAL,
                               (GSourceFunc) update_weatherdata,
                               data);
@@ -1455,7 +1455,7 @@ xfceweather_create_control(XfcePanelPlugin *plugin)
     gtk_scrollbox_set_label(GTK_SCROLLBOX(data->scrollbox), -1, "1");
     gtk_scrollbox_clear(GTK_SCROLLBOX(data->scrollbox));
 
-    data->updatetimeout =
+    data->update_timer =
         g_timeout_add_seconds(UPDATE_INTERVAL,
                               (GSourceFunc) update_weatherdata,
                               data);
@@ -1481,9 +1481,9 @@ xfceweather_free(XfcePanelPlugin *plugin,
     if (data->units)
         g_slice_free(units_config, data->units);
 
-    if (data->updatetimeout) {
-        g_source_remove(data->updatetimeout);
-        data->updatetimeout = 0;
+    if (data->update_timer) {
+        g_source_remove(data->update_timer);
+        data->update_timer = 0;
     }
 
     xmlCleanupParser();
diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
index e2541e5..61b4095 100644
--- a/panel-plugin/weather.h
+++ b/panel-plugin/weather.h
@@ -71,7 +71,7 @@ typedef struct {
     time_t last_astro_update;
     time_t last_data_update;
     time_t last_conditions_update;
-    gint updatetimeout;
+    guint update_timer;
 
     GtkWidget *scrollbox;
     gboolean show_scrollbox;