[Goodies-commits] r4905 - xfce4-datetime-plugin/trunk/panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2008-06-07 23:15:53 +0000 (Sat, 07 Jun 2008)
New Revision: 4905

Modified:
   xfce4-datetime-plugin/trunk/panel-plugin/datetime.c
   xfce4-datetime-plugin/trunk/panel-plugin/datetime.h
Log:
Change datetime_update() to take t_datetime


Modified: xfce4-datetime-plugin/trunk/panel-plugin/datetime.c
===================================================================
--- xfce4-datetime-plugin/trunk/panel-plugin/datetime.c	2008-06-07 23:15:48 UTC (rev 4904)
+++ xfce4-datetime-plugin/trunk/panel-plugin/datetime.c	2008-06-07 23:15:53 UTC (rev 4905)
@@ -113,21 +113,13 @@
 /*
  * set date and time labels
  */
-gboolean datetime_update(gpointer data)
+gboolean datetime_update(t_datetime *datetime)
 {
   GTimeVal timeval;
   gchar *utf8str;
   struct tm *current;
-  t_datetime *datetime;
   guint wake_interval;  /* milliseconds to next update */
 
-  if (data == NULL)
-  {
-    return FALSE;
-  }
-
-  datetime = (t_datetime*)data;
-
   /* stop timer */
   if (datetime->timeout_id)
   {
@@ -136,6 +128,7 @@
 
   g_get_current_time(&timeval);
   current = localtime((time_t *)&timeval.tv_sec);
+
   if (datetime->date_format != NULL && GTK_IS_LABEL(datetime->date_label))
   {
     utf8str = datetime_do_utf8strftime(datetime->date_format, current);
@@ -187,7 +180,7 @@
    * when the update interval is 1 or 60 seconds, respectively.
    */
   wake_interval = datetime->update_interval - datetime_gtimeval_to_ms(timeval) % datetime->update_interval;
-  datetime->timeout_id = g_timeout_add(wake_interval, datetime_update, datetime);
+  datetime->timeout_id = g_timeout_add(wake_interval, (GSourceFunc) datetime_update, datetime);
 
   return TRUE;
 }

Modified: xfce4-datetime-plugin/trunk/panel-plugin/datetime.h
===================================================================
--- xfce4-datetime-plugin/trunk/panel-plugin/datetime.h	2008-06-07 23:15:48 UTC (rev 4904)
+++ xfce4-datetime-plugin/trunk/panel-plugin/datetime.h	2008-06-07 23:15:53 UTC (rev 4905)
@@ -67,7 +67,7 @@
 } t_datetime;
 
 gboolean
-datetime_update(gpointer data);
+datetime_update(t_datetime *datetime);
 
 gchar *
 datetime_do_utf8strftime(