Hello community, here is the log from the commit of package evolution checked in at Sat Jul 8 17:20:07 CEST 2006. -------- --- GNOME/evolution/evolution.changes 2006-07-05 14:35:17.000000000 +0200 +++ evolution/evolution.changes 2006-07-08 13:01:43.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jul 8 11:13:29 CEST 2006 - kharish@suse.de + +- Added bnc-190421-cal-appointment-end-timezone.patch to handle + events with two timezones. +- Added bnc-190002-live-meeting.patch to handle meeting invitations + from Microsoft Live. + +------------------------------------------------------------------- New: ---- bnc-190002-live-meeting.patch bnc-190421-cal-appointment-end-timezone.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.bCkign/_old 2006-07-08 17:19:54.000000000 +0200 +++ /var/tmp/diff_new_pack.bCkign/_new 2006-07-08 17:19:54.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Obsoletes: bonobo-conf Version: 2.6.0 -Release: 69 +Release: 70 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.bz2 Source1: summerdance-about2.png @@ -110,6 +110,8 @@ Patch93: del-gw-appt.patch Patch94: working-0x.patch Patch95: evolution-datarootdir.patch +Patch96: bnc-190421-cal-appointment-end-timezone.patch +Patch97: bnc-190002-live-meeting.patch URL: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 shared-mime-info @@ -528,6 +530,11 @@ %{prefix}/share/gnome-pilot/conduits/*.conduit %changelog -n evolution +* Sat Jul 08 2006 - kharish@suse.de +- Added bnc-190421-cal-appointment-end-timezone.patch to handle + events with two timezones. +- Added bnc-190002-live-meeting.patch to handle meeting invitations + from Microsoft Live. * Wed Jul 05 2006 - aj@suse.de - Set datarootdir correctly. * Mon Jun 19 2006 - psankar@novell.com ++++++ bnc-190002-live-meeting.patch ++++++ --- plugins/itip-formatter/itip-formatter.c.orig 2006-07-08 10:53:40.000000000 +0200 +++ plugins/itip-formatter/itip-formatter.c 2006-07-08 11:00:20.000000000 +0200 @@ -1635,9 +1635,15 @@ format_itip_object (EMFormatHTML *efh, G case ICAL_METHOD_DECLINECOUNTER: itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_DECLINECOUNTER); break; - default: - g_assert_not_reached (); + case ICAL_METHOD_X : + /* Handle appointment requests from Microsoft Live. This is + * a best-at-hand-now handling. Must be revisited when we have + * better access to the source of such meetings */ + pitip->method = ICAL_METHOD_REQUEST; + itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_REQUEST); break; + default: + return FALSE; } itip_view_set_item_type (ITIP_VIEW (pitip->view), pitip->type); ++++++ bnc-190421-cal-appointment-end-timezone.patch ++++++ --- calendar/gui/e-cal-model.c 2006-07-08 10:32:11.000000000 +0200 +++ calendar/gui/e-cal-model.c.new 2006-07-08 10:31:43.000000000 +0200 @@ -2129,5 +2129,29 @@ e_cal_model_set_instance_times (ECalMode } comp_data->instance_start = icaltime_as_timet_with_zone (start_time, zone); + + if (end_time.zone) + zone = end_time.zone; + else { + icalparameter *param = NULL; + icalproperty *prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY); + + if (prop) { + param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER); + + if (param) { + const char *tzid = NULL; + icaltimezone *end_zone = NULL; + + tzid = icalparameter_get_tzid (param); + e_cal_get_timezone (comp_data->client, tzid, &end_zone, NULL); + + if (end_zone) + zone = end_zone; + } + } + + } + comp_data->instance_end = icaltime_as_timet_with_zone (end_time, zone); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org