Pull up from 0.9 branch

2001-02-08  JP Rosevear  <jpr@ximian.com>

	* gui/event-editor.c: Remove assorted menu/bonobo stuff

	* gui/dialogs/task-editor.c: Remove assorted menu/bonobo stuff
	(task_editor_construct): no longer suck out the glade contents
	into a bonobo win, listen for apply and close signals
	(tedit_apply_event_cb): listen for apply signal and save object
	(tedit_close_event_cb): listen for close signal and prompt to save
	if need be
	(task_editor_focus): new function to bring the dialog to the front

	* gui/dialogs/task-editor.h: new prototype

	* gui/e-meeting-edit.c (schedule_button_clicked_cb): no need to
	update widgets in the event editor since the event editor won't be
	open
	(e_meeting_editor_new): don't need the event editor reference any
	more

	* gui/e-meeting-edit.h: Change prototype

	* gui/e-day-view.c (e_day_view_on_event_right_click): Make
	schedule meeting a new contextual menu item
	(e_day_view_on_schedule_meet): new routine to schedule a meeting
	from the contextual menu

	* gui/e-calendar-table.c (e_calendar_table_open_task): Call
	task_editor_focus

	* gui/event-editor-dialog.glade: Update to be a property box

	* gui/dialogs/task-editor-dialog.glade: Update to be a property
	box

svn path=/trunk/; revision=8115

1 files changed, 2 insertions, 5 deletions

diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
index e8280a151e..934c284ae7 100644
--- a/calendar/gui/e-meeting-edit.c
+++ b/calendar/gui/e-meeting-edit.c
@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <bonobo.h>
 #include <glade/glade.h>
 #include <ical.h>
 #include <widgets/meeting-time-sel/e-meeting-time-sel.h>
@@ -54,7 +55,6 @@ struct _EMeetingEditorPrivate {
 	CalComponent *comp;
 	CalClient *client;
 	icalcomponent *icalcomp, *vevent;
-	EventEditor *ee;
 
 	gint numentries;  /* How many attendees are there? */
 	gboolean dirty;  /* Has anything changed? */
@@ -454,8 +454,6 @@ schedule_button_clicked_cb (GtkWidget *widget, gpointer data)
 		cal_component_free_datetime (&cal_dtstart);
 		cal_component_free_datetime (&cal_dtend);
 
-		event_editor_update_widgets (priv->ee);	
-
 		priv->dirty = TRUE;
 	}
 
@@ -831,7 +829,7 @@ organizer_changed_cb (GtkWidget *widget, gpointer data)
 /* ------------------------------------------------------------ */
 
 EMeetingEditor * 
-e_meeting_editor_new (CalComponent *comp, CalClient *client, EventEditor *ee)
+e_meeting_editor_new (CalComponent *comp, CalClient *client)
 {
 	EMeetingEditor *object;
 	EMeetingEditorPrivate *priv;
@@ -843,7 +841,6 @@ e_meeting_editor_new (CalComponent *comp, CalClient *client, EventEditor *ee)
 	priv->comp = comp;
 	priv->client = client;
 	priv->icalcomp = cal_component_get_icalcomponent (comp);
-	priv->ee = ee;
 	
 	object->priv = priv;