unref the model again (task_editor_edit_comp): don't allow editing if the

2003-05-01  JP Rosevear  <jpr@ximian.com>

	* gui/dialogs/task-editor.c (task_editor_finalize): unref the
	model again
	(task_editor_edit_comp): don't allow editing if the assignee has
	delegated

	* gui/dialogs/meeting-page.c (popup_delete_cb): set the new
	non-delegator to be editable

	* gui/dialogs/event-editor.c (event_editor_edit_comp): don't allow
	editing if the attendee has delegated
	(event_editor_finalize): unref the model again

	* gui/e-meeting-model.c: remove e-table-without related functions
	(finalize): don't create without table
	(e_meeting_model_etable_from_model): build the table with this as
	model
	(e_meeting_model_etable_model_to_view_row): directly use the
	model_to_view call
	(e_meeting_model_etable_view_to_model_row): as above
	(attendee_changed_cb): make sure pre change is alwasy called

	* gui/e-meeting-model.h: use DECLS, remove protos for long dead
	functions, don't include config.h

svn path=/trunk/; revision=21045

4 files changed, 11 insertions, 11 deletions

diff --git a/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore
index 3c01d14597..182657d5ac 100644
--- a/calendar/gui/dialogs/.cvsignore
+++ b/calendar/gui/dialogs/.cvsignore
@@ -2,4 +2,7 @@
 .pure
 Makefile
 Makefile.in
+Evolution-Addressbook-SelectNames-common.c
+Evolution-Addressbook-SelectNames-skels.c
+Evolution-Addressbook-SelectNames-stubs.c
 Evolution-Addressbook-SelectNames.h
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 73bb0e7d7b..93d0a39c53 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -300,7 +300,9 @@ event_editor_edit_comp (CompEditor *editor, CalComponent *comp)
 			EMeetingAttendee *ia;
 
 			ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca));
-			if (!comp_editor_get_user_org (editor))
+
+			/* If we aren't the organizer or the attendee is just delegating, don't allow editing */
+			if (!comp_editor_get_user_org (editor) || e_meeting_attendee_is_set_delto (ia))
 				e_meeting_attendee_set_edit_level (ia,  E_MEETING_ATTENDEE_EDIT_NONE);
 			e_meeting_model_add_attendee (priv->model, ia);
 
@@ -395,11 +397,7 @@ event_editor_finalize (GObject *object)
 	g_object_unref((priv->meet_page));
 	g_object_unref((priv->sched_page));
 
-#if 0
-	/* FIXME we don't unref here because we "sink" in 
-	   e-meeting-model.c:init */
 	g_object_unref (priv->model);
-#endif
 
 	g_free (priv);
 
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index d7e6e80d24..b511e44f01 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -683,8 +683,10 @@ popup_delete_cb (GtkWidget *widget, gpointer data)
 		EMeetingAttendee *ib;
 		
 		ib = e_meeting_model_find_attendee (priv->model, e_meeting_attendee_get_delfrom (ia), &pos);
-		if (ib != NULL)
+		if (ib != NULL) {
 			e_meeting_attendee_set_delto (ib, NULL);
+			e_meeting_attendee_set_edit_level (ib,  E_MEETING_ATTENDEE_EDIT_FULL);
+		}		
 	}
 	
 	/* Handle deleting all attendees in the delegation chain */	
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index d6f54bb288..f5add85a29 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -256,7 +256,8 @@ task_editor_edit_comp (CompEditor *editor, CalComponent *comp)
 			EMeetingAttendee *ia;
 
 			ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca));
- 			if (!comp_editor_get_user_org (editor))
+			/* If we aren't the organizer or the attendee is just delegating, don't allow editing */
+			if (!comp_editor_get_user_org (editor) || e_meeting_attendee_is_set_delto (ia))
  				e_meeting_attendee_set_edit_level (ia,  E_MEETING_ATTENDEE_EDIT_NONE);
   			e_meeting_model_add_attendee (priv->model, ia);			
 
@@ -349,11 +350,7 @@ task_editor_finalize (GObject *object)
 	g_object_unref((priv->task_details_page));
 	g_object_unref((priv->meet_page));
 	
-#if 0
-	/* FIXME we don't unref here because we "sink" in 
-	   e-meeting-model.c:init */
 	g_object_unref (priv->model);
-#endif
 	
 	if (G_OBJECT_CLASS (parent_class)->finalize)
 		(* G_OBJECT_CLASS (parent_class)->finalize) (object);