diff options
| -rw-r--r-- | calendar/ChangeLog | 19 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-list-view.c | 6 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 2 |
3 files changed, 19 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5fe4a724c8..6d19889ad6 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,16 @@ +2005-08-06 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #311686 + * gui/e-meeting-list-view.c (row_activated_cb):Added + a null check for path. + +2005-08-06 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #312460 + * gui/itip-utils.c (itip_get_comp_attendee): Removed + a double free. + + 2005-08-05 Viren.l <lviren@novell.com> Fixes #302460 @@ -6,12 +19,6 @@ e_calendar_view_edit_appointment with appropriate parameters. -2005-08-05 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #312460 - * gui/itip-utils.c (itip_get_comp_attendee): Removed - a double free. - 2005-08-03 Harry Lu <harry.lu@sun.com> Fix for #312447. diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index c4a6531c7d..101b6281a8 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -443,7 +443,7 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) EMeetingAttendeeEditLevel el; gint edit_level; GtkTreeModel *model; - GtkTreePath *path; + GtkTreePath *path = NULL; priv = view->priv; @@ -451,6 +451,10 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) if (gtk_tree_selection_get_selected (selection, &model, &iter)) { path = gtk_tree_model_get_path (model, &iter); } + + if (!path) + return; + row = gtk_tree_path_get_indices (path)[0]; existing_attendee = e_meeting_store_find_attendee_at_row (priv->store, row); el = e_meeting_attendee_get_edit_level (existing_attendee); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 641bdc45d5..2a3857e3ad 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -182,6 +182,7 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client) return user_email; } g_free (address); + address = NULL; } for (it = e_list_get_iterator((EList *)al); @@ -197,7 +198,6 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client) char *user_email = g_strdup (itip_strip_mailto (attendee->value)); e_cal_component_free_attendee_list (attendees); - g_free (address); return user_email; } } |