1 files changed, 30 insertions, 37 deletions

diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index c87985be34..b023d38316 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -65,14 +65,14 @@ static void flash (ExecutiveSummary *summary,
 		   void *closure);
 
 BonoboUIVerb verbs[] = {
-	BONOBO_UI_VERB ("AddService", embed_service),
+	BONOBO_UI_UNSAFE_VERB ("AddService", embed_service),
 	BONOBO_UI_VERB_END
 };
 
 static void
-set_pixmap (Bonobo_UIContainer container,
-	    const char *xml_path,
-	    const char *icon)
+set_pixmap (BonoboUIComponent *component,
+	    const char        *xml_path,
+	    const char        *icon)
 {
 	char *path;
 	GdkPixbuf *pixbuf;
@@ -82,53 +82,46 @@ set_pixmap (Bonobo_UIContainer container,
 	pixbuf = gdk_pixbuf_new_from_file (path);
 	g_return_if_fail (pixbuf != NULL);
 
-	bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf);
+	bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
 	gdk_pixbuf_unref (pixbuf);
 	g_free (path);
 }
 
 static void
-update_pixmaps (Bonobo_UIContainer container)
+update_pixmaps (BonoboUIComponent *component)
 {
-	set_pixmap (container, "/Toolbar/AddService", "add-service.png");
+	set_pixmap (component, "/Toolbar/AddService", "add-service.png");
 }
 
 static void
-control_activate (BonoboControl *control,
-		  BonoboUIHandler *uih,
-		  ESummary *esummary)
+control_activate (BonoboControl     *control,
+		  BonoboUIComponent *ui_component,
+		  ESummary          *esummary)
 {
-	BonoboUIComponent *component;
 	Bonobo_UIContainer container;
 
 	container = bonobo_control_get_remote_ui_handler (control);
-	bonobo_ui_handler_set_container (uih, container);
+	bonobo_ui_component_set_container (ui_component, container);
 	bonobo_object_release_unref (container, NULL);
 
-	g_assert (container == bonobo_ui_compat_get_container (uih));
-	g_return_if_fail (container != CORBA_OBJECT_NIL);
-
-	component = bonobo_ui_compat_get_component (uih);
-	bonobo_ui_component_add_verb_list_with_data (component, verbs, esummary);
+	bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary);
 	
-	bonobo_ui_container_freeze (container, NULL);
+	bonobo_ui_component_freeze (ui_component, NULL);
 
-	bonobo_ui_util_set_ui (component, container, EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
 			       "evolution-executive-summary.xml", 
 			       "evolution-executive-summary");
 
-	update_pixmaps (container);
-	bonobo_ui_container_thaw (container, NULL);
+	update_pixmaps (ui_component);
+	bonobo_ui_component_thaw (ui_component, NULL);
 }
 
 static void
-control_deactivate (BonoboControl *control,
-		    BonoboUIHandler *uih,
-		    ESummary *esummary)
+control_deactivate (BonoboControl     *control,
+		    BonoboUIComponent *ui_component,
+		    ESummary          *esummary)
 {
-	bonobo_ui_component_rm (bonobo_ui_compat_get_component (uih),
-				bonobo_ui_compat_get_container (uih), "/", NULL);
-	bonobo_ui_handler_unset_container (uih);
+	bonobo_ui_component_unset_container (ui_component);
 }
 
 static void
@@ -136,26 +129,26 @@ control_activate_cb (BonoboControl *control,
 		     gboolean activate,
 		     gpointer user_data)
 {
-  BonoboUIHandler *uih;
+	BonoboUIComponent *ui_component;
   
-  uih = bonobo_control_get_ui_handler (control);
-  g_assert (uih);
+	ui_component = bonobo_control_get_ui_component (control);
+	g_assert (ui_component != NULL);
 
-  if (activate)
-    control_activate (control, uih, user_data);
-  else
-    control_deactivate (control, uih, user_data);
+	if (activate)
+		control_activate (control, ui_component, user_data);
+	else
+		control_deactivate (control, ui_component, user_data);
 }
 
 static void
 control_destroy_cb (BonoboControl *control,
 		    gpointer user_data)
 {
-  GtkWidget *esummary = user_data;
+	GtkWidget *esummary = user_data;
 
-  control_list = g_list_remove (control_list, control);
+	control_list = g_list_remove (control_list, control);
 
-  gtk_object_destroy (GTK_OBJECT (esummary));
+	gtk_object_destroy (GTK_OBJECT (esummary));
 }
 
 static void