The big api rename ...

2000-11-02  Michael Meeks <michael@helixcode.com>

	* The big api rename ...

svn path=/trunk/; revision=6346

4 files changed, 378 insertions, 9 deletions

diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
new file mode 100644
index 0000000000..f8e0795590
--- /dev/null
+++ b/calendar/gui/Evolution-Composer.h
@@ -0,0 +1,369 @@
+/*
+ * This file was generated by orbit-idl - DO NOT EDIT!
+ */
+
+#include <glib.h>
+#define ORBIT_IDL_SERIAL 9
+#include <orb/orbit.h>
+
+#ifndef Evolution_Composer_H
+#define Evolution_Composer_H 1
+#ifdef __cplusplus
+extern "C"
+{
+#endif				/* __cplusplus */
+
+/** typedefs **/
+#include <bonobo/Bonobo.h>
+#if !defined(ORBIT_DECL_Evolution_Composer) && !defined(_Evolution_Composer_defined)
+#define ORBIT_DECL_Evolution_Composer 1
+#define _Evolution_Composer_defined 1
+#define Evolution_Composer__free CORBA_Object__free
+   typedef CORBA_Object Evolution_Composer;
+   extern CORBA_unsigned_long Evolution_Composer__classid;
+#if !defined(TC_IMPL_TC_Evolution_Composer_0)
+#define TC_IMPL_TC_Evolution_Composer_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_5 't'
+#define TC_IMPL_TC_Evolution_Composer_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_15 's'
+#define TC_IMPL_TC_Evolution_Composer_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_17 'r'
+   extern const struct CORBA_TypeCode_struct TC_Evolution_Composer_struct;
+#define TC_Evolution_Composer ((CORBA_TypeCode)&TC_Evolution_Composer_struct)
+#endif
+#endif
+#if !defined(_Evolution_Composer_Recipient_defined)
+#define _Evolution_Composer_Recipient_defined 1
+   typedef struct
+   {
+      CORBA_char *name;
+      CORBA_char *address;
+   }
+   Evolution_Composer_Recipient;
+
+#if !defined(TC_IMPL_TC_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_Recipient_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_Evolution_Composer_Recipient_struct;
+#define TC_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_Evolution_Composer_Recipient_struct)
+#endif
+   extern Evolution_Composer_Recipient
+      *Evolution_Composer_Recipient__alloc(void);
+   extern gpointer Evolution_Composer_Recipient__free(gpointer mem,
+						      gpointer dat,
+						      CORBA_boolean free_strings);	/* ORBit internal use */
+#endif
+#if !defined(ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient) && !defined(_CORBA_sequence_Evolution_Composer_Recipient_defined)
+#define ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient 1
+#define _CORBA_sequence_Evolution_Composer_Recipient_defined 1
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_5 't'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_15 's'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
+#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+   typedef struct
+   {
+      CORBA_unsigned_long _maximum,
+       _length;
+      Evolution_Composer_Recipient *_buffer;
+      CORBA_boolean _release;
+   }
+   CORBA_sequence_Evolution_Composer_Recipient;
+#if !defined(TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0)
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 'E'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 'v'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 'l'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 'u'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 't'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 'i'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 'n'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 '_'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 'C'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 'm'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 'p'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 'o'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 's'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 'e'
+#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_CORBA_sequence_Evolution_Composer_Recipient_struct;
+#define TC_CORBA_sequence_Evolution_Composer_Recipient ((CORBA_TypeCode)&TC_CORBA_sequence_Evolution_Composer_Recipient_struct)
+#endif
+   extern CORBA_sequence_Evolution_Composer_Recipient
+      *CORBA_sequence_Evolution_Composer_Recipient__alloc(void);
+   extern gpointer CORBA_sequence_Evolution_Composer_Recipient__free(gpointer
+								     mem,
+								     gpointer
+								     dat,
+								     CORBA_boolean free_strings);	/* ORBit internal use */
+   Evolution_Composer_Recipient
+      *CORBA_sequence_Evolution_Composer_Recipient_allocbuf
+      (CORBA_unsigned_long len);
+#endif
+#if !defined(_Evolution_Composer_RecipientList_defined)
+#define _Evolution_Composer_RecipientList_defined 1
+   typedef CORBA_sequence_Evolution_Composer_Recipient
+      Evolution_Composer_RecipientList;
+#if !defined(TC_IMPL_TC_Evolution_Composer_RecipientList_0)
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_5 't'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_15 's'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_RecipientList_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_Evolution_Composer_RecipientList_struct;
+#define TC_Evolution_Composer_RecipientList ((CORBA_TypeCode)&TC_Evolution_Composer_RecipientList_struct)
+#endif
+   extern Evolution_Composer_RecipientList
+      *Evolution_Composer_RecipientList__alloc(void);
+   extern gpointer Evolution_Composer_RecipientList__free(gpointer mem,
+							  gpointer dat,
+							  CORBA_boolean free_strings);	/* ORBit internal use */
+#endif
+#define ex_Evolution_Composer_CouldNotParse "IDL:Evolution/Composer/CouldNotParse:1.0"
+   void _ORBIT_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer *
+							  _ORBIT_recv_buffer,
+							  CORBA_Environment *
+							  ev);
+   void _ORBIT_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *
+							_ORBIT_send_buffer,
+							CORBA_Environment *
+							ev);
+#if !defined(_Evolution_Composer_CouldNotParse_defined)
+#define _Evolution_Composer_CouldNotParse_defined 1
+   typedef struct
+   {
+      int dummy;
+   }
+   Evolution_Composer_CouldNotParse;
+
+#if !defined(TC_IMPL_TC_Evolution_Composer_CouldNotParse_0)
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_0 'E'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_1 'v'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_2 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_3 'l'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_4 'u'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_5 't'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_6 'i'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_7 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_8 'n'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_9 '_'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_10 'C'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_11 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_12 'm'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_13 'p'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_14 'o'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_15 's'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_16 'e'
+#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_17 'r'
+   extern const struct CORBA_TypeCode_struct
+      TC_Evolution_Composer_CouldNotParse_struct;
+#define TC_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&TC_Evolution_Composer_CouldNotParse_struct)
+#endif
+#define Evolution_Composer_CouldNotParse__alloc() NULL
+   extern gpointer Evolution_Composer_CouldNotParse__free(gpointer mem,
+							  gpointer dat,
+							  CORBA_boolean free_strings);	/* ORBit internal use */
+#endif
+
+/** POA structures **/
+   typedef struct
+   {
+      void *_private;
+      void (*set_headers) (PortableServer_Servant _servant,
+			   const Evolution_Composer_RecipientList * to,
+			   const Evolution_Composer_RecipientList * cc,
+			   const Evolution_Composer_RecipientList * bcc,
+			   const CORBA_char * subject,
+			   CORBA_Environment * ev);
+      void (*set_body_text) (PortableServer_Servant _servant,
+			     const CORBA_char * body, CORBA_Environment * ev);
+      void (*attach_MIME) (PortableServer_Servant _servant,
+			   const CORBA_char * data, CORBA_Environment * ev);
+      void (*attach_data) (PortableServer_Servant _servant,
+			   const CORBA_char * content_type,
+			   const CORBA_char * filename,
+			   const CORBA_char * description,
+			   const CORBA_boolean show_inline,
+			   const CORBA_char * data, CORBA_Environment * ev);
+      void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);
+   }
+   POA_Evolution_Composer__epv;
+   typedef struct
+   {
+      PortableServer_ServantBase__epv *_base_epv;
+      POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
+      POA_Evolution_Composer__epv *Evolution_Composer_epv;
+   }
+   POA_Evolution_Composer__vepv;
+   typedef struct
+   {
+      void *_private;
+      POA_Evolution_Composer__vepv *vepv;
+   }
+   POA_Evolution_Composer;
+   extern void POA_Evolution_Composer__init(PortableServer_Servant servant,
+					    CORBA_Environment * ev);
+   extern void POA_Evolution_Composer__fini(PortableServer_Servant servant,
+					    CORBA_Environment * ev);
+
+/** prototypes **/
+#define Evolution_Composer_ref Bonobo_Unknown_ref
+#define Evolution_Composer_unref Bonobo_Unknown_unref
+#define Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface
+   void Evolution_Composer_set_headers(Evolution_Composer _obj,
+				       const Evolution_Composer_RecipientList
+				       * to,
+				       const Evolution_Composer_RecipientList
+				       * cc,
+				       const Evolution_Composer_RecipientList
+				       * bcc, const CORBA_char * subject,
+				       CORBA_Environment * ev);
+   void Evolution_Composer_set_body_text(Evolution_Composer _obj,
+					 const CORBA_char * body,
+					 CORBA_Environment * ev);
+   void Evolution_Composer_attach_MIME(Evolution_Composer _obj,
+				       const CORBA_char * data,
+				       CORBA_Environment * ev);
+   void Evolution_Composer_attach_data(Evolution_Composer _obj,
+				       const CORBA_char * content_type,
+				       const CORBA_char * filename,
+				       const CORBA_char * description,
+				       const CORBA_boolean show_inline,
+				       const CORBA_char * data,
+				       CORBA_Environment * ev);
+   void Evolution_Composer_show(Evolution_Composer _obj,
+				CORBA_Environment * ev);
+
+   void _ORBIT_skel_Evolution_Composer_set_headers(POA_Evolution_Composer *
+						   _ORBIT_servant,
+						   GIOPRecvBuffer *
+						   _ORBIT_recv_buffer,
+						   CORBA_Environment * ev,
+						   void (*_impl_set_headers)
+						   (PortableServer_Servant
+						    _servant,
+						    const
+						    Evolution_Composer_RecipientList
+						    * to,
+						    const
+						    Evolution_Composer_RecipientList
+						    * cc,
+						    const
+						    Evolution_Composer_RecipientList
+						    * bcc,
+						    const CORBA_char *
+						    subject,
+						    CORBA_Environment * ev));
+   void _ORBIT_skel_Evolution_Composer_set_body_text(POA_Evolution_Composer *
+						     _ORBIT_servant,
+						     GIOPRecvBuffer *
+						     _ORBIT_recv_buffer,
+						     CORBA_Environment * ev,
+						     void
+						     (*_impl_set_body_text)
+						     (PortableServer_Servant
+						      _servant,
+						      const CORBA_char * body,
+						      CORBA_Environment *
+						      ev));
+   void _ORBIT_skel_Evolution_Composer_attach_MIME(POA_Evolution_Composer *
+						   _ORBIT_servant,
+						   GIOPRecvBuffer *
+						   _ORBIT_recv_buffer,
+						   CORBA_Environment * ev,
+						   void (*_impl_attach_MIME)
+						   (PortableServer_Servant
+						    _servant,
+						    const CORBA_char * data,
+						    CORBA_Environment * ev));
+   void _ORBIT_skel_Evolution_Composer_attach_data(POA_Evolution_Composer *
+						   _ORBIT_servant,
+						   GIOPRecvBuffer *
+						   _ORBIT_recv_buffer,
+						   CORBA_Environment * ev,
+						   void (*_impl_attach_data)
+						   (PortableServer_Servant
+						    _servant,
+						    const CORBA_char *
+						    content_type,
+						    const CORBA_char *
+						    filename,
+						    const CORBA_char *
+						    description,
+						    const CORBA_boolean
+						    show_inline,
+						    const CORBA_char * data,
+						    CORBA_Environment * ev));
+   void _ORBIT_skel_Evolution_Composer_show(POA_Evolution_Composer *
+					    _ORBIT_servant,
+					    GIOPRecvBuffer *
+					    _ORBIT_recv_buffer,
+					    CORBA_Environment * ev,
+					    void (*_impl_show)
+					    (PortableServer_Servant _servant,
+					     CORBA_Environment * ev));
+#ifdef __cplusplus
+}
+#endif				/* __cplusplus */
+
+#endif
+#undef ORBIT_IDL_SERIAL
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 80f55db054..daf2b8ea15 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -126,7 +126,7 @@ calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control)
 				 _("The URI that the calendar will display"),
 				 0);
 
-	bonobo_control_set_property_bag (control, pbag);
+	bonobo_control_set_properties (control, pbag);
 }
 
 /* Callback factory function for calendar controls */
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index d64db8ab6b..8ae2c7d1d6 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -269,7 +269,7 @@ task_editor_construct (TaskEditor *tedit)
 		goto error;
 	}
 
-	bonobo_win = bonobo_win_new ("event-editor-dialog", "Event Editor");
+	bonobo_win = bonobo_window_new ("event-editor-dialog", "Event Editor");
 
 	/* FIXME: The sucking bit */
 	{
@@ -283,14 +283,14 @@ task_editor_construct (TaskEditor *tedit)
 		}
 		gtk_widget_ref (contents);
 		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_win_set_contents (BONOBO_WIN (bonobo_win), contents);
+		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
 		gtk_widget_destroy (priv->app);
 		priv->app = GTK_WIDGET (bonobo_win);
 	}
 
 	{
 		BonoboUIContainer *container = bonobo_ui_container_new ();
-		bonobo_ui_container_set_win (container, BONOBO_WIN (priv->app));
+		bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->app));
 		bonobo_ui_component_set_container (
 			priv->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
 	}
@@ -942,7 +942,7 @@ debug_xml_cb (GtkWidget *widget, gpointer data)
 	TaskEditor *tedit = TASK_EDITOR (data);
 	TaskEditorPrivate *priv = tedit->priv;
 	
-	bonobo_win_dump (BONOBO_WIN (priv->app), "on demand");
+	bonobo_window_dump (BONOBO_WINDOW (priv->app), "on demand");
 }
 
 /* File/Save callback */
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index fec654d98f..fc3764e102 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -1746,7 +1746,7 @@ debug_xml_cb (GtkWidget *widget, gpointer data)
 	EventEditor *ee = EVENT_EDITOR (data);
 	EventEditorPrivate *priv = ee->priv;
 	
-	bonobo_win_dump (BONOBO_WIN (priv->app), "on demand");
+	bonobo_window_dump (BONOBO_WINDOW (priv->app), "on demand");
 }
 
 /* File/Save callback */
@@ -1904,7 +1904,7 @@ event_editor_construct (EventEditor *ee)
 	}
 
 	/* Construct the app */
-	bonobo_win = bonobo_win_new ("event-editor-dialog", "Event Editor");
+	bonobo_win = bonobo_window_new ("event-editor-dialog", "Event Editor");
 
 	/* FIXME: The sucking bit */
 	{
@@ -1918,14 +1918,14 @@ event_editor_construct (EventEditor *ee)
 		}
 		gtk_widget_ref (contents);
 		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_win_set_contents (BONOBO_WIN (bonobo_win), contents);
+		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
 		gtk_widget_destroy (priv->app);
 		priv->app = bonobo_win;
 	}
 
 	{
 		BonoboUIContainer *container = bonobo_ui_container_new ();
-		bonobo_ui_container_set_win (container, BONOBO_WIN (priv->app));
+		bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv->app));
 		bonobo_ui_component_set_container (
 			priv->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
 	}