[almanah] Update calendar sources from gnome-panel trunk

[Philip Withnall <pwithnall src gnome org>]

commit 015fdc4e4aa4078856c07b91a3fca545402bf95a
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun May 2 23:19:52 2010 +0100

    Update calendar sources from gnome-panel trunk

 src/event-factories/calendar-client.c |   67 ++++++++++++++++-----------------
 src/event-factories/calendar-client.h |   14 +++---
 2 files changed, 40 insertions(+), 41 deletions(-)
---
diff --git a/src/event-factories/calendar-client.c b/src/event-factories/calendar-client.c
index 2a72e4d..bbdb473 100644
--- a/src/event-factories/calendar-client.c
+++ b/src/event-factories/calendar-client.c
@@ -523,7 +523,7 @@ calendar_client_new (void)
  *
  * "What?", you say, "Something useful in libc?"
  */
-static inline GTime
+static inline time_t
 make_time_for_day_begin (int day,
 			 int month,
 			 int year)
@@ -543,14 +543,14 @@ make_isodate_for_day_begin (int day,
 			    int month,
 			    int year)
 {
-  GTime utctime;
+  time_t utctime;
 
   utctime = make_time_for_day_begin (day, month, year);
 
   return utctime != -1 ? isodate_from_time_t (utctime) : NULL;
 }
 
-static GTime
+static time_t
 get_time_from_property (icalcomponent         *ical,
 			icalproperty_kind      prop_kind,
 			struct icaltimetype (* get_prop_func) (const icalproperty *prop),
@@ -597,7 +597,7 @@ get_ical_rid (icalcomponent *ical)
   ical_time = icalproperty_get_recurrenceid (prop);
 
   return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ? 
-    icaltime_as_ical_string (ical_time) : NULL;
+    g_strdup (icaltime_as_ical_string (ical_time)) : NULL;
 }
 
 static char *
@@ -624,7 +624,7 @@ get_ical_description (icalcomponent *ical)
   return g_strdup (icalproperty_get_description (prop));
 }
 
-static inline GTime
+static inline time_t
 get_ical_start_time (icalcomponent *ical,
                      icaltimezone  *default_zone)
 {
@@ -634,7 +634,7 @@ get_ical_start_time (icalcomponent *ical,
                                  default_zone);
 }
 
-static inline GTime
+static inline time_t
 get_ical_end_time (icalcomponent *ical,
                    icaltimezone  *default_zone)
 {
@@ -646,13 +646,12 @@ get_ical_end_time (icalcomponent *ical,
 
 static gboolean
 get_ical_is_all_day (icalcomponent *ical,
-                     GTime          start_gtime,
+                     time_t         start_time,
                      icaltimezone  *default_zone)
 {
   icalproperty            *prop;
-  time_t                   start_time;
   struct tm               *start_tm;
-  GTime                    end_time;
+  time_t                   end_time;
   struct icaldurationtype  duration;
   struct icaltimetype      start_icaltime;
 
@@ -660,7 +659,6 @@ get_ical_is_all_day (icalcomponent *ical,
   if (start_icaltime.is_date)
     return TRUE;
 
-  start_time = (time_t) start_gtime;
   start_tm = gmtime (&start_time);
   if (start_tm->tm_sec  != 0 ||
       start_tm->tm_min  != 0 ||
@@ -679,7 +677,7 @@ get_ical_is_all_day (icalcomponent *ical,
   return icaldurationtype_as_int (duration) % 86400 == 0;
 }
 
-static inline GTime
+static inline time_t
 get_ical_due_time (icalcomponent *ical,
                    icaltimezone  *default_zone)
 {
@@ -713,7 +711,7 @@ get_ical_percent_complete (icalcomponent *ical)
   return CLAMP (percent_complete, 0, 100);
 }
 
-static inline GTime
+static inline time_t
 get_ical_completed_time (icalcomponent *ical,
                          icaltimezone  *default_zone)
 {
@@ -909,11 +907,12 @@ resolve_timezone_id (const char *tzid,
 
 static gboolean
 calendar_appointment_collect_occurrence (ECalComponent  *component,
-					 GTime           occurrence_start,
-					 GTime           occurrence_end,
-					 GSList        **collect_loc)
+					 time_t          occurrence_start,
+					 time_t          occurrence_end,
+					 gpointer        data)
 {
   CalendarOccurrence *occurrence;
+  GSList **collect_loc = data;
 
   occurrence             = g_new0 (CalendarOccurrence, 1);
   occurrence->start_time = occurrence_start;
@@ -928,8 +927,8 @@ static void
 calendar_appointment_generate_ocurrences (CalendarAppointment *appointment,
 					  icalcomponent       *ical,
 					  ECal                *source,
-					  GTime                start,
-					  GTime                end,
+					  time_t               start,
+					  time_t               end,
                                           icaltimezone        *default_zone)
 {
   ECalComponent *ecal;
@@ -943,7 +942,7 @@ calendar_appointment_generate_ocurrences (CalendarAppointment *appointment,
   e_cal_recur_generate_instances (ecal,
 				  start,
 				  end,
-				  (ECalRecurInstanceFn) calendar_appointment_collect_occurrence,
+				  calendar_appointment_collect_occurrence,
 				  &appointment->occurrences,
 				  (ECalRecurResolveTimezoneFn) resolve_timezone_id,
 				  source,
@@ -1160,8 +1159,8 @@ static void
 calendar_event_generate_ocurrences (CalendarEvent *event,
 				    icalcomponent *ical,
 				    ECal          *source,
-				    GTime          start,
-				    GTime          end,
+				    time_t         start,
+				    time_t         end,
                                     icaltimezone  *default_zone)
 {
   if (event->type != CALENDAR_EVENT_APPOINTMENT)
@@ -1332,8 +1331,8 @@ calendar_client_handle_query_result (CalendarClientSource *source,
   gboolean             emit_signal;
   gboolean             events_changed;
   GList               *l;
-  GTime                month_begin;
-  GTime                month_end;
+  time_t               month_begin;
+  time_t               month_end;
 
   client = source->client;
 
@@ -1846,8 +1845,8 @@ typedef struct
 {
   CalendarClient *client;
   GSList         *events;
-  GTime           start_time;
-  GTime           end_time;
+  time_t          start_time;
+  time_t          end_time;
 } FilterData;
 
 typedef void (* CalendarEventFilterFunc) (const char    *uid,
@@ -1870,8 +1869,8 @@ filter_appointment (const char    *uid,
   for (l = occurrences; l; l = l->next)
     {
       CalendarOccurrence *occurrence = l->data;
-      GTime start_time = occurrence->start_time;
-      GTime end_time   = occurrence->end_time;
+      time_t start_time = occurrence->start_time;
+      time_t end_time   = occurrence->end_time;
 
       if ((start_time >= filter_data->start_time &&
            start_time < filter_data->end_time) ||
@@ -1924,8 +1923,8 @@ static GSList *
 calendar_client_filter_events (CalendarClient          *client,
 			       GSList                  *sources,
 			       CalendarEventFilterFunc  filter_func,
-			       GTime                    start_time,
-			       GTime                    end_time)
+			       time_t                   start_time,
+			       time_t                   end_time)
 {
   FilterData  filter_data;
   GSList     *l;
@@ -1966,8 +1965,8 @@ calendar_client_get_events (CalendarClient    *client,
 {
   GSList *appointments;
   GSList *tasks;
-  GTime   day_begin;
-  GTime   day_end;
+  time_t  day_begin;
+  time_t  day_end;
 
   g_return_val_if_fail (CALENDAR_IS_CLIENT (client), NULL);
   g_return_val_if_fail (client->priv->day   != -1 &&
@@ -2021,8 +2020,8 @@ calendar_client_foreach_appointment_day (CalendarClient  *client,
 {
   GSList   *appointments, *l;
   gboolean  marked_days [32] = { FALSE, };
-  GTime     month_begin;
-  GTime     month_end;
+  time_t    month_begin;
+  time_t    month_end;
   int       i;
 
   g_return_if_fail (CALENDAR_IS_CLIENT (client));
@@ -2048,7 +2047,7 @@ calendar_client_foreach_appointment_day (CalendarClient  *client,
 
       if (appointment->start_time)
         {
-          GTime day_time = appointment->start_time;
+          time_t day_time = appointment->start_time;
 
           if (day_time >= month_begin)
             marked_days [day_from_time_t (day_time)] = TRUE;
@@ -2060,7 +2059,7 @@ calendar_client_foreach_appointment_day (CalendarClient  *client,
 	      /* mark the days for the appointment, no need to add an extra one when duration is a multiple of 86400 */
               for (day_offset = 1; day_offset <= duration / 86400 && duration != day_offset * 86400; day_offset++)
                 {
-                  GTime day_tm = appointment->start_time + day_offset * 86400;
+                  time_t day_tm = appointment->start_time + day_offset * 86400;
 
                   if (day_tm > month_end)
                     break;
diff --git a/src/event-factories/calendar-client.h b/src/event-factories/calendar-client.h
index de8ce9b..3ae3b2f 100644
--- a/src/event-factories/calendar-client.h
+++ b/src/event-factories/calendar-client.h
@@ -65,8 +65,8 @@ struct _CalendarClientClass
 
 typedef struct
 {
-  GTime start_time;
-  GTime end_time;
+  time_t start_time;
+  time_t end_time;
 } CalendarOccurrence;
 
 typedef struct
@@ -77,8 +77,8 @@ typedef struct
   char   *summary;
   char   *description;
   char   *color_string;
-  GTime   start_time;
-  GTime   end_time;
+  time_t  start_time;
+  time_t  end_time;
   guint   is_all_day : 1;
 
   /* Only used internally */
@@ -92,10 +92,10 @@ typedef struct
   char  *description;
   char  *color_string;
   char  *url;
-  GTime  start_time;
-  GTime  due_time;
+  time_t start_time;
+  time_t due_time;
   guint  percent_complete;
-  GTime  completed_time;
+  time_t completed_time;
   int    priority;
 } CalendarTask;