diff options
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-list-view.c | 1 | ||||
| -rw-r--r-- | calendar/gui/e-select-names-editable.c | 62 |
3 files changed, 41 insertions, 33 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 22b7d64921..1b1f5d7194 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2006-09-08 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #343409 + * gui/e-select-names-editable.c: + (e_select_names_editable_get_emails), + (e_select_names_editable_get_name), + (e_select_names_editable_get_names): Reverting the + fix for the bug 320101 as it breaks delegation feature. + * gui/e-meeting-list-view.c: (attendee_edited_cb): copy + the delfrom parameter from the attendee being edited. + 2006-09-01 Chenthill Palanisamy <pchenthill@novell.com> Fixes #353763 diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 5ac6c7c463..7dac185c7a 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -343,6 +343,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address e_meeting_attendee_set_role (attendee, e_meeting_attendee_get_role (existing_attendee)); e_meeting_attendee_set_rsvp (attendee, e_meeting_attendee_get_rsvp (existing_attendee)); e_meeting_attendee_set_status (attendee, e_meeting_attendee_get_status (existing_attendee)); + e_meeting_attendee_set_delfrom (attendee, e_meeting_attendee_get_delfrom (existing_attendee)); } e_meeting_list_view_add_attendee_to_name_selector (E_MEETING_LIST_VIEW (view), attendee); } diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c index c6bca611b2..bc4a754a8c 100644 --- a/calendar/gui/e-select-names-editable.c +++ b/calendar/gui/e-select-names-editable.c @@ -129,7 +129,7 @@ GList * e_select_names_editable_get_emails (ESelectNamesEditable *esne) { EDestinationStore *destination_store; - GList *destinations, *l; + GList *destinations; EDestination *destination; GList *result = NULL; @@ -140,26 +140,24 @@ e_select_names_editable_get_emails (ESelectNamesEditable *esne) if (!destinations) return NULL; - for (l = destinations; l != NULL; l = l->next) { - destination = l->data; - if (e_destination_is_evolution_list (destination)) { - const GList *list_dests, *l; - - list_dests = e_destination_list_get_dests (destination); - for (l = list_dests; l != NULL; l = g_list_next (l)) { - result = g_list_append (result, g_strdup (e_destination_get_email (l->data))); - } - } else { - /* check if the contact is contact list, it does not contain all the email ids */ - /* we dont expand it currently, TODO do we need to expand it by getting it from addressbook*/ - if (e_contact_get (e_destination_get_contact (destination), E_CONTACT_IS_LIST)) { - /* If its a contact_list which is not expanded, it wont have a email id, - so we can use the name as the email id */ - - result = g_list_append (result, g_strdup (e_destination_get_name (destination))); - } else - result = g_list_append (result, g_strdup (e_destination_get_email (destination))); + destination = destinations->data; + if (e_destination_is_evolution_list (destination)) { + const GList *list_dests, *l; + + list_dests = e_destination_list_get_dests (destination); + for (l = list_dests; l != NULL; l = g_list_next (l)) { + result = g_list_append (result, g_strdup (e_destination_get_email (l->data))); } + } else { + /* check if the contact is contact list, it does not contain all the email ids */ + /* we dont expand it currently, TODO do we need to expand it by getting it from addressbook*/ + if (e_contact_get (e_destination_get_contact (destination), E_CONTACT_IS_LIST)) { + /* If its a contact_list which is not expanded, it wont have a email id, + so we can use the name as the email id */ + + result = g_list_append (result, g_strdup (e_destination_get_name (destination))); + } else + result = g_list_append (result, g_strdup (e_destination_get_email (destination))); } g_list_free (destinations); @@ -184,7 +182,6 @@ e_select_names_editable_get_name (ESelectNamesEditable *esne) destination = destinations->data; result = g_strdup (e_destination_get_name (destination)); - g_list_free (destinations); return result; } @@ -193,7 +190,7 @@ GList * e_select_names_editable_get_names (ESelectNamesEditable *esne) { EDestinationStore *destination_store; - GList *destinations, *l; + GList *destinations; EDestination *destination; GList *result = NULL; @@ -204,19 +201,18 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne) if (!destinations) return NULL; - for (l = destinations; l != NULL; l = l->next) { - destination = l->data; - if (e_destination_is_evolution_list (destination)) { - const GList *list_dests, *l; - - list_dests = e_destination_list_get_dests (destination); - for (l = list_dests; l != NULL; l = g_list_next (l)) { - result = g_list_append (result, g_strdup (e_destination_get_name (l->data))); - } - } else { - result = g_list_append (result, g_strdup (e_destination_get_name (destination))); + destination = destinations->data; + if (e_destination_is_evolution_list (destination)) { + const GList *list_dests, *l; + + list_dests = e_destination_list_get_dests (destination); + for (l = list_dests; l != NULL; l = g_list_next (l)) { + result = g_list_append (result, g_strdup (e_destination_get_name (l->data))); } + } else { + result = g_list_append (result, g_strdup (e_destination_get_name (destination))); } + g_list_free (destinations); return result; |