2 files changed, 7 insertions, 4 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f039c51745..6a51cf75a3 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -645,7 +645,7 @@ real_send_comp (CompEditor *editor, CalComponentItipMethod method)
 	g_return_if_fail (IS_COMP_EDITOR (editor));
 
 	priv = editor->priv;
-	
+
 	itip_send_comp (method, priv->comp);
 }
 
@@ -751,6 +751,7 @@ comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *ve
 	CompEditorPrivate *priv;
 	BonoboUIEngine *engine;
 	BonoboUINode *node;
+	const char *name;
 	
 	g_return_if_fail (editor != NULL);
 	g_return_if_fail (IS_COMP_EDITOR (editor));
@@ -762,7 +763,8 @@ comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *ve
 				      "evolution-calendar");
 	g_assert (node != NULL);
 
-	bonobo_ui_engine_xml_merge_tree (engine, "/", node, "comp-editor");
+	name = bonobo_ui_component_get_name (priv->uic);	
+	bonobo_ui_engine_xml_merge_tree (engine, "/", node, name);
 	bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor);
 }
 
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index ea73ba2abf..0b5fe9ec16 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -47,7 +47,7 @@ struct _EventEditorPrivate {
 	SchedulePage *sched_page;
 
 	EMeetingModel *model;
-	
+
 	gboolean meeting_shown;
 	gboolean updating;	
 };
@@ -349,6 +349,7 @@ schedule_meeting_cmd (GtkWidget *widget, gpointer data)
 		priv->meeting_shown = TRUE;
 
 		set_menu_sens (ee);
+ 		comp_editor_set_changed (COMP_EDITOR (ee), priv->meeting_shown);
 		comp_editor_set_needs_send (COMP_EDITOR (ee), priv->meeting_shown);
 	}
 	
@@ -383,7 +384,7 @@ forward_cmd (GtkWidget *widget, gpointer data)
 {
 	EventEditor *ee = EVENT_EDITOR (data);
 	
-	comp_editor_save_comp (COMP_EDITOR (ee));
+	comp_editor_save_comp (COMP_EDITOR (ee));	
 	comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_PUBLISH);
 }