4 files changed, 158 insertions, 207 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 3e245a0c98..00584c51de 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -26,19 +26,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-window-icon.h>
+#include <gnome.h>
+#include <bonobo/bonobo-win.h>
+#include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-ui-container.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <gal/widgets/e-unicode.h>
-#include <e-util/e-dialog-utils.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-dialog-util.h>
+#include <libgnomeui/gnome-window-icon.h>
 #include <evolution-shell-component-utils.h>
 #include "../print.h"
 #include "save-comp.h"
@@ -60,7 +56,8 @@ struct _CompEditorPrivate {
 	/* The pages we have */
 	GList *pages;
 
-	/* UI Component for the dialog */
+	/* Toplevel window for the dialog */
+	GtkWidget *window;
 	BonoboUIComponent *uic;
 
 	/* Notebook to hold the pages */
@@ -70,7 +67,6 @@ struct _CompEditorPrivate {
 
 	gboolean changed;
 	gboolean needs_send;
-	gboolean needs_send_new;
 	gboolean updating;
 };
 
@@ -78,17 +74,16 @@ struct _CompEditorPrivate {
 
 static void comp_editor_class_init (CompEditorClass *class);
 static void comp_editor_init (CompEditor *editor);
-static gint comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e);
 static void comp_editor_destroy (GtkObject *object);
 
 static void real_set_cal_client (CompEditor *editor, CalClient *client);
 static void real_edit_comp (CompEditor *editor, CalComponent *comp);
 static void real_send_comp (CompEditor *editor, CalComponentItipMethod method);
-static gboolean prompt_to_save_changes (CompEditor *editor, gboolean send);
 static void delete_comp (CompEditor *editor);
 static void close_dialog (CompEditor *editor);
 
 static void page_changed_cb (GtkObject *obj, gpointer data);
+static void page_needs_send_cb (GtkObject *obj, gpointer data);
 static void page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data);
 static void page_dates_changed_cb (GtkObject *obj, CompEditorPageDates *dates, gpointer data);
 
@@ -137,6 +132,8 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB_END
 };
 
+#define CLASS(page) (COMP_EDITOR_CLASS (GTK_OBJECT (page)->klass))
+
 static GtkObjectClass *parent_class;
 
 
@@ -158,7 +155,7 @@ comp_editor_get_type (void)
 			(GtkClassInitFunc) NULL
 		};
 
-		comp_editor_type = gtk_type_unique (BONOBO_TYPE_WINDOW,
+		comp_editor_type = gtk_type_unique (GTK_TYPE_OBJECT,
 						    &comp_editor_info);
 	}
 
@@ -170,18 +167,15 @@ static void
 comp_editor_class_init (CompEditorClass *klass)
 {
 	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
 
-	object_class = GTK_OBJECT_CLASS (klass);
-	widget_class = GTK_WIDGET_CLASS (klass);
+	object_class = (GtkObjectClass *) klass;
 
-	parent_class = gtk_type_class (BONOBO_TYPE_WINDOW);
+	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
 
 	klass->set_cal_client = real_set_cal_client;
 	klass->edit_comp = real_edit_comp;
 	klass->send_comp = real_send_comp;
 
-	widget_class->key_press_event = comp_editor_key_press_event;
 	object_class->destroy = comp_editor_destroy;
 }
 
@@ -196,16 +190,15 @@ setup_widgets (CompEditor *editor)
 	priv = editor->priv;
 
 	/* Window and basic vbox */
-	bonobo_window_construct (BONOBO_WINDOW (editor),
-				 "event-editor", "iCalendar Editor");
-	gtk_signal_connect (GTK_OBJECT (editor), "delete_event",
+	priv->window = bonobo_window_new ("event-editor", "iCalendar Editor");
+	gtk_signal_connect (GTK_OBJECT (priv->window), "delete_event",
 			    GTK_SIGNAL_FUNC (delete_event_cb), editor);
 
 	priv->uic = bonobo_ui_component_new_default ();
 	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor));
+	bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->window));
 	bonobo_ui_component_set_container (priv->uic, BONOBO_OBJREF (container));
-	bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (editor)),
+	bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (priv->window)),
 					  "/evolution/UIConf/kvps");
 
 	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
@@ -217,7 +210,7 @@ setup_widgets (CompEditor *editor)
 	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
 	gtk_widget_show (vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);
-	bonobo_window_set_contents (BONOBO_WINDOW (editor), vbox);
+	bonobo_window_set_contents (BONOBO_WINDOW (priv->window), vbox);
 
 	/* Notebook */
 	priv->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
@@ -240,23 +233,6 @@ comp_editor_init (CompEditor *editor)
 	priv->pages = NULL;
 	priv->changed = FALSE;
 	priv->needs_send = FALSE;
-	priv->needs_send_new = FALSE;
-}
-
-
-static gint
-comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e)
-{
-	if (e->keyval == GDK_Escape) {
-		if (prompt_to_save_changes (COMP_EDITOR (d), TRUE))
-			close_dialog (COMP_EDITOR (d));
-		return TRUE;
-	}
-
-	if (GTK_WIDGET_CLASS (parent_class)->key_press_event)
-		return (* GTK_WIDGET_CLASS (parent_class)->key_press_event) (d, e);
-
-	return FALSE;
 }
 
 /* Destroy handler for the calendar component editor */
@@ -272,6 +248,11 @@ comp_editor_destroy (GtkObject *object)
 
 	gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), editor);
 
+	if (priv->window) {
+		gtk_widget_destroy (priv->window);
+		priv->window = NULL;
+	}
+
 	/* We want to destroy the pages after the widgets get destroyed,
 	   since they have lots of signal handlers connected to the widgets
 	   with the pages as the data. */
@@ -297,7 +278,6 @@ save_comp (CompEditor *editor)
 	CompEditorPrivate *priv;
 	CalComponent *clone;
 	GList *l;
-	CalClientResult result;
 
 	priv = editor->priv;
 
@@ -317,29 +297,11 @@ save_comp (CompEditor *editor)
 
 	priv->updating = TRUE;
 
-	result = cal_client_update_object (priv->client, priv->comp);
-	if (result != CAL_CLIENT_RESULT_SUCCESS) {
+	if (!cal_client_update_object (priv->client, priv->comp)) {
 		GtkWidget *dlg;
-		char *msg;
-
-		switch (result) {
-		case CAL_CLIENT_RESULT_INVALID_OBJECT :
-			msg = g_strdup (_("Could not update invalid object"));
-			break;
-		case CAL_CLIENT_RESULT_NOT_FOUND :
-			msg = g_strdup (_("Object not found, not updated"));
-			break;
-		case CAL_CLIENT_RESULT_PERMISSION_DENIED :
-			msg = g_strdup (_("You don't have permissions to update this object"));
-			break;
-		default :
-			msg = g_strdup (_("Could not update object"));
-			break;
-		}
 
-		dlg = gnome_error_dialog (msg);
+		dlg = gnome_error_dialog (_("Could not update object!"));
 		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-		g_free (msg);
 
 		return FALSE;
 	} else {
@@ -364,7 +326,7 @@ save_comp_with_send (CompEditor *editor)
 	if (!save_comp (editor))
 		return FALSE;
 
-	if (send && send_component_dialog (priv->comp, priv->needs_send_new))
+	if (send && send_component_dialog (priv->comp))
 		comp_editor_send_comp (editor, CAL_COMPONENT_METHOD_REQUEST);
 
 	return TRUE;
@@ -395,7 +357,7 @@ prompt_to_save_changes (CompEditor *editor, gboolean send)
 	if (!priv->changed)
 		return TRUE;
 
-	switch (save_component_dialog (GTK_WINDOW (editor))) {
+	switch (save_component_dialog (GTK_WINDOW (priv->window))) {
 	case 0: /* Save */
 		if (send && save_comp_with_send (editor))
 			return TRUE;
@@ -411,19 +373,6 @@ prompt_to_save_changes (CompEditor *editor, gboolean send)
 	}
 }
 
-/* This sets the focus to the toplevel, so any field being edited is committed.
-   FIXME: In future we may also want to check some of the fields are valid,
-   e.g. the EDateEdit fields. */
-static void
-commit_all_fields (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
-	gtk_window_set_focus (GTK_WINDOW (editor), NULL);
-}
-
 /* Closes the dialog box and emits the appropriate signals */
 static void
 close_dialog (CompEditor *editor)
@@ -432,6 +381,8 @@ close_dialog (CompEditor *editor)
 
 	priv = editor->priv;
 
+	g_assert (priv->window != NULL);
+
 	gtk_object_destroy (GTK_OBJECT (editor));
 }
 
@@ -587,6 +538,8 @@ comp_editor_append_page (CompEditor *editor,
 	gtk_notebook_append_page (priv->notebook, page_widget, label_widget);
 
 	/* Listen for things happening on the page */
+	gtk_signal_connect (GTK_OBJECT (page), "needs_send",
+			    GTK_SIGNAL_FUNC (page_needs_send_cb), editor);
 	gtk_signal_connect (GTK_OBJECT (page), "changed",
 			    GTK_SIGNAL_FUNC (page_changed_cb), editor);
 	gtk_signal_connect (GTK_OBJECT (page), "summary_changed",
@@ -782,7 +735,7 @@ set_title_from_comp (CompEditor *editor)
 
 	priv = editor->priv;
 	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (editor), title);
+	gtk_window_set_title (GTK_WINDOW (priv->window), title);
 	g_free (title);
 }
 
@@ -794,7 +747,7 @@ set_icon_from_comp (CompEditor *editor)
 
 	priv = editor->priv;
 	file = make_icon_from_comp (priv->comp);
-	gnome_window_icon_set_from_file (GTK_WINDOW (editor), file);
+	gnome_window_icon_set_from_file (GTK_WINDOW (priv->window), file);
 }
 
 static void
@@ -867,8 +820,6 @@ real_edit_comp (CompEditor *editor, CalComponent *comp)
 	if (comp)
 		priv->comp = cal_component_clone (comp);
 
-	priv->needs_send_new = !priv->needs_send;
-	
 	set_title_from_comp (editor);
 	set_icon_from_comp (editor);
 	fill_widgets (editor);
@@ -913,19 +864,6 @@ comp_editor_edit_comp (CompEditor *editor, CalComponent *comp)
 }
 
 CalComponent *
-comp_editor_get_comp (CompEditor *editor)
-{
-	CompEditorPrivate *priv;
-
-	g_return_val_if_fail (editor != NULL, NULL);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);
-
-	priv = editor->priv;
-
-	return priv->comp;
-}
-
-CalComponent *
 comp_editor_get_current_comp (CompEditor *editor)
 {
 	CompEditorPrivate *priv;
@@ -991,23 +929,6 @@ comp_editor_send_comp (CompEditor *editor, CalComponentItipMethod method)
 		klass->send_comp (editor, method);
 }
 
-gboolean
-comp_editor_close (CompEditor *editor)
-{
-	gboolean close;
-	
-	g_return_val_if_fail (editor != NULL, FALSE);
-	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
-
-	commit_all_fields (editor);
-	
-	close = prompt_to_save_changes (editor, TRUE);
-	if (close)
-		close_dialog (editor);
-
-	return close;
-}
-
 /**
  * comp_editor_merge_ui:
  * @editor:
@@ -1017,10 +938,7 @@ comp_editor_close (CompEditor *editor)
  *
  **/
 void
-comp_editor_merge_ui (CompEditor *editor,
-		      const char *filename,
-		      BonoboUIVerb *verbs,
-		      EPixmap *component_pixmaps)
+comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *verbs)
 {
 	CompEditorPrivate *priv;
 
@@ -1031,9 +949,6 @@ comp_editor_merge_ui (CompEditor *editor,
 
 	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, filename, "evolution-calendar");
 	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
-
-	if (component_pixmaps != NULL)
-		e_pixmaps_update (priv->uic, component_pixmaps);
 }
 
 /**
@@ -1087,8 +1002,21 @@ comp_editor_focus (CompEditor *editor)
 
 	priv = editor->priv;
 
-	gtk_widget_show (GTK_WIDGET (editor));
-	raise_and_focus (GTK_WIDGET (editor));
+	gtk_widget_show (priv->window);
+	raise_and_focus (priv->window);
+}
+
+/* This sets the focus to the toplevel, so any field being edited is committed.
+   FIXME: In future we may also want to check some of the fields are valid,
+   e.g. the EDateEdit fields. */
+static void
+commit_all_fields (CompEditor *editor)
+{
+	CompEditorPrivate *priv;
+
+	priv = editor->priv;
+
+	gtk_window_set_focus (GTK_WINDOW (priv->window), NULL);
 }
 
 /* Menu Commands */
@@ -1114,37 +1042,89 @@ save_close_cmd (GtkWidget *widget, gpointer data)
 }
 
 static void
-save_as_cmd (GtkWidget *widget, gpointer data)
+save_as_ok (GtkWidget *widget, gpointer data)
 {
 	CompEditor *editor = COMP_EDITOR (data);
 	CompEditorPrivate *priv;
-	char *filename;
-	char *ical_string;
-	FILE *file;
-	
+	struct stat s;
+	char *path;
+	int ret = 0;
+
 	priv = editor->priv;
 
-	commit_all_fields (editor);
+	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (priv->filesel));
 
-	filename = e_file_dialog_save (_("Save as..."));
-	if (filename == NULL)
-		return;
-	
-	ical_string = cal_client_get_component_as_string (priv->client, priv->comp);
-	if (ical_string == NULL) {
-		g_warning ("Couldn't convert item to a string");
-		return;
+	if (stat (path, &s) == 0) {
+		GtkWidget *dlg;
+		GtkWidget *text;
+
+		dlg = gnome_dialog_new (_("Overwrite file?"),
+					GNOME_STOCK_BUTTON_YES,
+					GNOME_STOCK_BUTTON_NO,
+					NULL);
+		text = gtk_label_new (_("A file by that name already exists.\nOverwrite it?"));
+		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox), text, TRUE, TRUE, 4);
+		gtk_window_set_policy (GTK_WINDOW (dlg), FALSE, TRUE, FALSE);
+		gtk_widget_show (text);
+
+		ret = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
 	}
-	
-	file = fopen (filename, "w");
-	if (file == NULL) {
-		g_warning ("Couldn't save item");
-		return;
+
+	if (ret == 0) {
+		FILE *file;
+		gchar *ical_string;
+
+		ical_string = cal_client_get_component_as_string (priv->client, priv->comp);
+		if (ical_string == NULL) {
+			g_warning ("Couldn't convert item to a string");
+			gtk_main_quit ();
+			return;
+		}
+
+		file = fopen (path, "w");
+		if (file == NULL) {
+			g_warning ("Couldn't save item");
+			gtk_main_quit ();
+			return;
+		}
+
+		fprintf (file, ical_string);
+		g_free (ical_string);
+		fclose (file);
+
+		gtk_main_quit ();
 	}
-	
-	fprintf (file, ical_string);
-	g_free (ical_string);
-	fclose (file);
+}
+
+static void
+save_as_cmd (GtkWidget *widget, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CompEditorPrivate *priv;
+	GtkFileSelection *fs;
+	char *path;
+
+	priv = editor->priv;
+
+	commit_all_fields (editor);
+
+	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save As...")));
+	path = g_strdup_printf ("%s/", g_get_home_dir ());
+	gtk_file_selection_set_filename (fs, path);
+	g_free (path);
+
+	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
+			    GTK_SIGNAL_FUNC (save_as_ok), editor);
+	gtk_signal_connect (GTK_OBJECT (fs->cancel_button), "clicked",
+			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+
+	priv->filesel = GTK_WIDGET (fs);
+	gtk_widget_show (priv->filesel);
+	gtk_grab_add (priv->filesel);
+	gtk_main ();
+
+	gtk_widget_destroy (priv->filesel);
+	priv->filesel = NULL;
 }
 
 static void
@@ -1158,7 +1138,7 @@ delete_cmd (GtkWidget *widget, gpointer data)
 
 	vtype = cal_component_get_vtype (priv->comp);
 
-	if (delete_component_dialog (priv->comp, FALSE, 1, vtype, GTK_WIDGET (editor)))
+	if (delete_component_dialog (priv->comp, FALSE, 1, vtype, priv->window))
 		delete_comp (editor);
 }
 
@@ -1221,6 +1201,17 @@ page_changed_cb (GtkObject *obj, gpointer data)
 	priv->changed = TRUE;
 }
 
+static void
+page_needs_send_cb (GtkObject *obj, gpointer data)
+{
+	CompEditor *editor = COMP_EDITOR (data);
+	CompEditorPrivate *priv;
+
+	priv = editor->priv;
+
+	priv->needs_send = TRUE;
+}
+
 /* Page signal callbacks */
 static void
 page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data)
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 08c98dfaba..3531ac02d3 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -69,11 +69,6 @@ static void forward_cmd (GtkWidget *widget, gpointer data);
 static void model_row_changed_cb (ETableModel *etm, int row, gpointer data);
 static void row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data);
 
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/Toolbar/Actions/ActionScheduleMeeting", "schedule-meeting-24.png"),
-	E_PIXMAP_END
-};
-
 static BonoboUIVerb verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cmd),
 	BONOBO_UI_UNSAFE_VERB ("ActionRefreshMeeting", refresh_meeting_cmd),
@@ -211,7 +206,7 @@ event_editor_init (EventEditor *ee)
 				 COMP_EDITOR_PAGE (priv->meet_page),
 				 _("Meeting"));
 
- 	comp_editor_merge_ui (COMP_EDITOR (ee), "evolution-event-editor.xml", verbs, pixmaps);
+ 	comp_editor_merge_ui (COMP_EDITOR (ee), "evolution-event-editor.xml", verbs);
 
 	priv->meeting_shown = TRUE;
 	priv->existing_org = FALSE;
@@ -358,8 +353,9 @@ event_editor_new (void)
 }
 
 static void
-show_meeting (EventEditor *ee)
+schedule_meeting_cmd (GtkWidget *widget, gpointer data)
 {
+	EventEditor *ee = EVENT_EDITOR (data);
 	EventEditorPrivate *priv;
 
 	priv = ee->priv;
@@ -382,24 +378,6 @@ show_meeting (EventEditor *ee)
 			       COMP_EDITOR_PAGE (priv->meet_page));
 }
 
-void
-event_editor_show_meeting (EventEditor *ee)
-{
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-
-	show_meeting (ee);
-}
-
-static void
-schedule_meeting_cmd (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-
-	show_meeting (ee);
-}
-
 static void
 refresh_meeting_cmd (GtkWidget *widget, gpointer data)
 {
diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c
index 2504ed3993..7333380195 100644
--- a/calendar/gui/dialogs/meeting-page.c
+++ b/calendar/gui/dialogs/meeting-page.c
@@ -698,12 +698,14 @@ enum {
 
 static EPopupMenu context_menu[] = {
 #if 0
-	E_POPUP_ITEM (N_("_Delegate To..."), GTK_SIGNAL_FUNC (popup_delegate_cb),  CAN_DELEGATE),
+	{ N_("_Delegate To..."),              NULL,
+	  GTK_SIGNAL_FUNC (popup_delegate_cb),NULL,  CAN_DELEGATE },
 
 	E_POPUP_SEPARATOR,
 #endif
 
-	E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (popup_delete_cb),   CAN_DELETE),
+	{ N_("_Delete"),                      GNOME_STOCK_MENU_TRASH,
+	  GTK_SIGNAL_FUNC (popup_delete_cb),  NULL,  CAN_DELETE },
 	
 	E_POPUP_TERMINATOR
 };
@@ -721,10 +723,7 @@ right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer da
 
 	view_row = e_table_model_to_view_row (etable, row);
 	priv->row = e_meeting_model_etable_view_to_model_row (etable, priv->model, view_row);
-	
-	/* FIXME: if you enable Delegate, then change index to '1' */
-	context_menu[0].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH);
-	
+
 	menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, data);
 	e_auto_kill_popup_menu_on_hide (menu);
 	
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index e3acaaf13a..c5c4d61826 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -42,7 +42,7 @@ struct _TaskEditorPrivate {
 
 	EMeetingModel *model;
 	
-	gboolean assignment_shown;
+	gboolean meeting_shown;
 	gboolean existing_org;
 	gboolean updating;	
 };
@@ -134,7 +134,7 @@ set_menu_sens (TaskEditor *te)
 	
 	priv = te->priv;
 
-	sens = priv->assignment_shown;
+	sens = priv->meeting_shown;
 	comp_editor_set_ui_prop (COMP_EDITOR (te), 
 				 "/commands/ActionAssignTask", 
 				 "sensitive", sens ? "0" : "1");
@@ -189,9 +189,9 @@ task_editor_init (TaskEditor *te)
 				 COMP_EDITOR_PAGE (priv->meet_page),
 				 _("Assignment"));
 
-	comp_editor_merge_ui (COMP_EDITOR (te), "evolution-task-editor.xml", verbs, NULL);
+	comp_editor_merge_ui (COMP_EDITOR (te), "evolution-task-editor.xml", verbs);
 
-	priv->assignment_shown = TRUE;
+	priv->meeting_shown = TRUE;
 	priv->existing_org = FALSE;
 	priv->updating = FALSE;	
 
@@ -217,11 +217,11 @@ task_editor_edit_comp (CompEditor *editor, CalComponent *comp)
 	e_meeting_model_remove_all_attendees (priv->model);
 	if (attendees == NULL) {
 		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv->meet_page));
-		priv->assignment_shown = FALSE;
+		priv->meeting_shown = FALSE;
 	} else {
 		GSList *l;
 
-		if (!priv->assignment_shown)
+		if (!priv->meeting_shown)
 			comp_editor_append_page (COMP_EDITOR (te),
 						 COMP_EDITOR_PAGE (priv->meet_page),
 						 _("Assignment"));
@@ -233,12 +233,12 @@ task_editor_edit_comp (CompEditor *editor, CalComponent *comp)
 			e_meeting_model_add_attendee (priv->model, ia);
 			gtk_object_unref (GTK_OBJECT (ia));
 		}
-		priv->assignment_shown = TRUE;		
+		priv->meeting_shown = TRUE;		
 	}
 	cal_component_free_attendee_list (attendees);
 
 	set_menu_sens (te);
-	comp_editor_set_needs_send (COMP_EDITOR (te), priv->assignment_shown);
+	comp_editor_set_needs_send (COMP_EDITOR (te), priv->meeting_shown);
 
 	priv->updating = FALSE;
 	
@@ -312,44 +312,27 @@ task_editor_new (void)
 }
 
 static void
-show_assignment (TaskEditor *te)
+assign_task_cmd (GtkWidget *widget, gpointer data)
 {
+	TaskEditor *te = TASK_EDITOR (data);
 	TaskEditorPrivate *priv;
 
 	priv = te->priv;
 
-	if (!priv->assignment_shown) {
+	if (!priv->meeting_shown) {
 		comp_editor_append_page (COMP_EDITOR (te),
 					 COMP_EDITOR_PAGE (priv->meet_page),
 					 _("Assignment"));
-		priv->assignment_shown = TRUE;
+		priv->meeting_shown = TRUE;
 
 		set_menu_sens (te);
-		comp_editor_set_needs_send (COMP_EDITOR (te), priv->assignment_shown);
-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);
+		comp_editor_set_needs_send (COMP_EDITOR (te), priv->meeting_shown);
 	}
 
 	comp_editor_show_page (COMP_EDITOR (te),
 			       COMP_EDITOR_PAGE (priv->meet_page));
 }
 
-void
-task_editor_show_assignment (TaskEditor *te)
-{
-	g_return_if_fail (te != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (te));
-
-	show_assignment (te);
-}
-
-static void
-assign_task_cmd (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *te = TASK_EDITOR (data);
-
-	show_assignment (te);
-}
-
 static void
 refresh_task_cmd (GtkWidget *widget, gpointer data)
 {