aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-util/cal-util.c
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@src.gnome.org>2003-08-08 22:58:02 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2003-08-08 22:58:02 +0800
commitfa0a110592ab3feda8051417d5dd198e96308367 (patch)
tree30611ac69b73e59a48b89acd0d40c154ef303ece /calendar/cal-util/cal-util.c
parentdc84df9871b3171a21d62feec988160f3c608103 (diff)
downloadgsoc2013-evolution-fa0a110592ab3feda8051417d5dd198e96308367.tar
gsoc2013-evolution-fa0a110592ab3feda8051417d5dd198e96308367.tar.gz
gsoc2013-evolution-fa0a110592ab3feda8051417d5dd198e96308367.tar.bz2
gsoc2013-evolution-fa0a110592ab3feda8051417d5dd198e96308367.tar.lz
gsoc2013-evolution-fa0a110592ab3feda8051417d5dd198e96308367.tar.xz
gsoc2013-evolution-fa0a110592ab3feda8051417d5dd198e96308367.tar.zst
gsoc2013-evolution-fa0a110592ab3feda8051417d5dd198e96308367.zip
Merged ECalendarTable changes from new-calendar-branch
svn path=/trunk/; revision=22143
Diffstat (limited to 'calendar/cal-util/cal-util.c')
-rw-r--r--calendar/cal-util/cal-util.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c
index ad495bca77..9bedf7d53c 100644
--- a/calendar/cal-util/cal-util.c
+++ b/calendar/cal-util/cal-util.c
@@ -612,7 +612,7 @@ cal_util_expand_uri (char *uri, gboolean tasks)
/* callback for icalcomponent_foreach_tzid */
typedef struct {
icalcomponent *vcal_comp;
- CalComponent *comp;
+ icalcomponent *icalcomp;
} ForeachTzidData;
static void
@@ -631,8 +631,7 @@ add_timezone_cb (icalparameter *param, void *data)
if (tz)
return;
- tz = icalcomponent_get_timezone (cal_component_get_icalcomponent (f_data->comp),
- tzid);
+ tz = icalcomponent_get_timezone (f_data->icalcomp, tzid);
if (!tz) {
tz = icaltimezone_get_builtin_timezone_from_tzid (tzid);
if (!tz)
@@ -651,15 +650,14 @@ add_timezone_cb (icalparameter *param, void *data)
* in the given CalComponent. */
void
cal_util_add_timezones_from_component (icalcomponent *vcal_comp,
- CalComponent *comp)
+ icalcomponent *icalcomp)
{
ForeachTzidData f_data;
g_return_if_fail (vcal_comp != NULL);
- g_return_if_fail (IS_CAL_COMPONENT (comp));
+ g_return_if_fail (icalcomp != NULL);;
f_data.vcal_comp = vcal_comp;
- f_data.comp = comp;
- icalcomponent_foreach_tzid (cal_component_get_icalcomponent (comp),
- add_timezone_cb, &f_data);
+ f_data.icalcomp = icalcomp;
+ icalcomponent_foreach_tzid (icalcomp, add_timezone_cb, &f_data);
}