diff options
| author | Seth Alves <alves@src.gnome.org> | 2000-04-26 08:02:43 +0800 |
|---|---|---|
| committer | Seth Alves <alves@src.gnome.org> | 2000-04-26 08:02:43 +0800 |
| commit | fba8692c75c362bc4fa2c0f872cfdf4fb80b1e5c (patch) | |
| tree | 173104d7907889222fa1b39eccd99d144cb80a8c /calendar | |
| parent | 11ca78748823a81e9a063ea5354ff7f0051199eb (diff) | |
| download | gsoc2013-evolution-fba8692c75c362bc4fa2c0f872cfdf4fb80b1e5c.tar.gz gsoc2013-evolution-fba8692c75c362bc4fa2c0f872cfdf4fb80b1e5c.tar.zst gsoc2013-evolution-fba8692c75c362bc4fa2c0f872cfdf4fb80b1e5c.zip | |
compare iCalObjects by their UIDs instead of by their pointers.
* gui/e-day-view.c (e_day_view_find_event_from_ico): compare
iCalObjects by their UIDs instead of by their pointers.
svn path=/trunk/; revision=2617
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 3 | ||||
| -rw-r--r-- | calendar/cal-util/calobj.c | 3 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index beb21064d6..ec34110476 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,8 @@ 2000-04-25 Seth Alves <alves@hungry.com> + * gui/e-day-view.c (e_day_view_find_event_from_ico): compare + iCalObjects by their UIDs instead of by their pointers. + * pcs/cal-backend.c (cal_backend_destroy): don't save on destroy. 2000-04-25 Ettore Perazzoli <ettore@helixcode.com> diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c index 53be88f362..9b66e5795b 100644 --- a/calendar/cal-util/calobj.c +++ b/calendar/cal-util/calobj.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Calendar objects implementations. * Copyright (C) 1998 the Free Software Foundation @@ -1011,7 +1012,7 @@ ical_object_to_vobject (iCalObject *ical) if (strchr (ical->summary, '\n')) addProp (s, VCQuotedPrintableProp); } else { - addPropValue (o, VCSummaryProp, _("Appointment")); + //addPropValue (o, VCSummaryProp, _("Snark")); } /* status */ diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index e47cbed34b..65151e49a6 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1234,7 +1234,10 @@ e_day_view_find_event_from_ico (EDayView *day_view, event_num++) { event = &g_array_index (day_view->events[day], EDayViewEvent, event_num); - if (event->ico == ico) { + //if (event->ico == ico) { + if (ico && ico->uid && + event && event->ico && event->ico->uid && + (strcmp (ico->uid, event->ico->uid) == 0)) { *day_return = day; *event_num_return = event_num; return TRUE; |