diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 3ca0ea5b63..2ab4ec08b1 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-04-29 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #240823 + + * gui/itip-utils.c: (comp_to_list): + Send notification only to individuals and groups. + 2008-04-28 Milan Crha <mcrha@redhat.com> ** Fix for bug #524121 diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 9398bcfd52..e529042051 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -499,7 +499,9 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users, for (l = attendees; l != NULL; l = l->next) { ECalComponentAttendee *att = l->data; - if (users_has_attendee (users, att->value)) + if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP) + continue; + else if (users_has_attendee (users, att->value)) continue; else if (att->sentby && users_has_attendee (users, att->sentby)) continue; @@ -541,6 +543,9 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users, for (l = attendees; l != NULL; l = l->next) { ECalComponentAttendee *att = l->data; + if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP) + continue; + destination = e_destination_new (); if (att->cn != NULL) e_destination_set_name (destination, att->cn); @@ -564,7 +569,6 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users, } break; - case E_CAL_COMPONENT_METHOD_ADD: case E_CAL_COMPONENT_METHOD_REFRESH: case E_CAL_COMPONENT_METHOD_COUNTER: @@ -592,6 +596,9 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users, for (l = attendees; l != NULL; l = l->next) { ECalComponentAttendee *att = l->data; + if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP) + continue; + if (!g_ascii_strcasecmp (itip_strip_mailto (att->value), sender) || (att->sentby && !g_ascii_strcasecmp (itip_strip_mailto (att->sentby), sender))){ if (!(att->delfrom && *att->delfrom)) |