** Fix for bug #380644

2007-11-26  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #380644

	* gui/dialogs/task-page.h: (task_page_add_attendee):
	* gui/dialogs/task-page.c: (task_page_add_attendee):
	* gui/dialogs/event-page.h: (event_page_add_attendee):
	* gui/dialogs/event-page.c: (event_page_add_attendee):
	New function to add attendee to store and name selector.
	* gui/dialogs/task-page.c: (remove_attendee): Remove attendee also
	from name selector (keep consistent).
	* gui/dialogs/task-editor.c: (task_editor_edit_comp):
	Use task_page_add_attendee to add known attendees.
	* gui/dialogs/event-editor.c: (event_editor_edit_comp):
	Use event_page_add_attendee to add known attendees.

	* gui/e-meeting-store.c: (e_meeting_store_remove_all_attendees),
	(e_meeting_store_remove_attendee): Code cleanup by Matthew Barnes.


svn path=/trunk/; revision=34582

1 files changed, 5 insertions, 5 deletions

diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 2703836049..88b83233e0 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -779,14 +779,13 @@ e_meeting_store_remove_attendee (EMeetingStore *store, EMeetingAttendee *attende
 	}
 
 	if (row != -1) {
-
-		g_ptr_array_remove_index (store->priv->attendees, row);
-		g_object_unref (attendee);
-
 		path = gtk_tree_path_new ();
 		gtk_tree_path_append_index (path, row);
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
 		gtk_tree_path_free (path);
+
+		g_ptr_array_remove_index (store->priv->attendees, row);		
+		g_object_unref (attendee);
 	}
 }
 
@@ -800,10 +799,11 @@ e_meeting_store_remove_all_attendees (EMeetingStore *store)
 
 	for (i = 0; i < store->priv->attendees->len; i++) {
 		EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, i);
-		g_object_unref (attendee);
 
 		gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path);
 		gtk_tree_path_next (path);
+
+		g_object_unref (attendee);
 	}
 
 	g_ptr_array_set_size (store->priv->attendees, 0);