diff options
| author | pchenthill <pchenthill@novell.com> | 2004-07-23 18:17:35 +0800 |
|---|---|---|
| committer | Sivaiah Nallagatla <siva@src.gnome.org> | 2004-07-23 18:17:35 +0800 |
| commit | 6c924ca1da4bc8b21d5154234829d0e97c44b962 (patch) | |
| tree | 24a148b52aab8ca178c983d40016ec8fc0d84f08 /calendar | |
| parent | e49741fbd8cbec90754459fbb996c7a1be865d8e (diff) | |
| download | gsoc2013-evolution-6c924ca1da4bc8b21d5154234829d0e97c44b962.tar gsoc2013-evolution-6c924ca1da4bc8b21d5154234829d0e97c44b962.tar.gz gsoc2013-evolution-6c924ca1da4bc8b21d5154234829d0e97c44b962.tar.bz2 gsoc2013-evolution-6c924ca1da4bc8b21d5154234829d0e97c44b962.tar.lz gsoc2013-evolution-6c924ca1da4bc8b21d5154234829d0e97c44b962.tar.xz gsoc2013-evolution-6c924ca1da4bc8b21d5154234829d0e97c44b962.tar.zst gsoc2013-evolution-6c924ca1da4bc8b21d5154234829d0e97c44b962.zip | |
Retracting the commit made below for #59983 as it has results in crash
2004-07-23 pchenthill <pchenthill@novell.com>
* Retracting the commit made below for #59983 as it has
results in crash some cases
svn path=/trunk/; revision=26713
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 33 |
2 files changed, 7 insertions, 31 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ee934b558a..81c9802f0b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,10 @@ 2004-07-23 pchenthill <pchenthill@novell.com> + * Retracting the commit made below for #59983 as it has + results in crash some cases + +2004-07-23 pchenthill <pchenthill@novell.com> + Fixes #59983 * gui/e-itip-control.c (show_current_event): If the ecal component is already loaded, check for the participation diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index c567c0b2a2..89ecaf110b 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -1216,37 +1216,8 @@ show_current_event (EItipControl *itip) itip_desc = _("<b>%s</b> requests the presence of %s at a meeting."); else itip_desc = _("<b>%s</b> requests your presence at a meeting."); - itip_title = _("Meeting Proposal"); - if (priv->current_ecal) { - ECalComponentAttendee *attendee= NULL, *tmp; - char *email_add; - GList *attendee_list, *l; - - e_cal_component_get_attendee_list (priv->comp, &attendee_list); - e_cal_get_cal_address (priv->current_ecal, &email_add, NULL); - - for (l = attendee_list; l ; l = g_slist_next (l)) { - tmp = (ECalComponentAttendee *) (l->data); - if (!strcmp (tmp->value + 7, email_add)) { - attendee = tmp; - break; - } - } - if (attendee) { - switch (attendee->status) { - case ICAL_PARTSTAT_ACCEPTED: - case ICAL_PARTSTAT_DECLINED: - case ICAL_PARTSTAT_TENTATIVE: - options = get_request_options (FALSE); - break; - - /* otherwise it must be needs action */ - default: - options = get_request_options (TRUE); - } - } - } else - options = get_request_options (TRUE); + itip_title = _("Meeting Proposal"); + options = get_request_options (priv->current_ecal ? FALSE : TRUE); break; case ICAL_METHOD_ADD: itip_desc = _("<b>%s</b> wishes to add to an existing meeting."); |