diff options
| author | Hans Petter <hansp@src.gnome.org> | 2003-09-12 06:04:44 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-09-12 06:04:44 +0800 |
| commit | 697761cc337aa77a47140c8df50ed84bc25e23f6 (patch) | |
| tree | b785830f72e9938cceaa016a419c7b6d9892bada /calendar/gui/e-cal-model-calendar.c | |
| parent | 733d77e657516f9a59b5c1a7b62acb87b03ec86f (diff) | |
| download | gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.gz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.bz2 gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.lz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.xz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.zst gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.zip | |
Import new libical from mainline HEAD and make appropriate changes to
Evolution.
svn path=/trunk/; revision=22538
Diffstat (limited to 'calendar/gui/e-cal-model-calendar.c')
| -rw-r--r-- | calendar/gui/e-cal-model-calendar.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c index 73ecaf3e94..82de4e6d5a 100644 --- a/calendar/gui/e-cal-model-calendar.c +++ b/calendar/gui/e-cal-model-calendar.c @@ -128,7 +128,7 @@ get_dtend (ECalModelComponent *comp_data) /* FIXME: handle errors */ cal_client_get_timezone (comp_data->client, - icaltimezone_get_tzid (icaltimezone_get_builtin_timezone (tt_end.zone)), + icaltime_get_tzid (tt_end), &zone); comp_data->dtend->zone = zone; } @@ -155,12 +155,14 @@ get_transparency (ECalModelComponent *comp_data) prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_TRANSP_PROPERTY); if (prop) { - const char *transp; + icalproperty_transp transp; transp = icalproperty_get_transp (prop); - if (strcasecmp (transp, "TRANSPARENT") == 0) + if (transp == ICAL_TRANSP_TRANSPARENT || + transp == ICAL_TRANSP_TRANSPARENTNOCONFLICT) return _("Free"); - else if (strcasecmp (transp, "OPAQUE") == 0) + else if (transp == ICAL_TRANSP_OPAQUE || + transp == ICAL_TRANSP_OPAQUENOCONFLICT) return _("Busy"); } @@ -251,12 +253,12 @@ set_transparency (ECalModelComponent *comp_data, const void *value) icalproperty_free (prop); } } else { - const char *transp; + icalproperty_transp transp; - if (strcasecmp (value, "FREE")) - transp = "TRANSPARENT"; - else if (strcasecmp (value, "OPAQUE")) - transp = "OPAQUE"; + if (!strcasecmp (value, "FREE")) + transp = ICAL_TRANSP_TRANSPARENT; + else if (!strcasecmp (value, "OPAQUE")) + transp = ICAL_TRANSP_OPAQUE; else { if (prop) { icalcomponent_remove_property (comp_data->icalcomp, prop); |