aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/contact-editor/e-contact-editor.c6
-rw-r--r--addressbook/gui/component/addressbook.c2
-rw-r--r--addressbook/gui/component/select-names/e-select-names-bonobo.c2
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c6
-rw-r--r--addressbook/gui/widgets/e-minicard-control.c2
-rw-r--r--calendar/gui/Evolution-Composer.h369
-rw-r--r--calendar/gui/control-factory.c2
-rw-r--r--calendar/gui/dialogs/task-editor.c8
-rw-r--r--calendar/gui/event-editor.c8
-rw-r--r--composer/e-msg-composer.c12
-rw-r--r--composer/e-msg-composer.h4
-rw-r--r--executive-summary/component/e-summary-factory.c6
-rw-r--r--mail/mail-threads.c2
-rw-r--r--mail/subscribe-dialog.c6
-rw-r--r--mail/test-mail.c4
-rw-r--r--shell/e-shell-view-menu.c2
-rw-r--r--shell/e-shell-view.c16
-rw-r--r--shell/e-shell-view.h4
-rw-r--r--shell/e-shell.c2
-rw-r--r--shell/evolution-storage.c2
20 files changed, 417 insertions, 48 deletions
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index c0921a7204..aa2f4cffc2 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -869,7 +869,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
/* Construct the app */
- bonobo_win = bonobo_win_new ("contact-editor-dialog", "Contact Editor");
+ bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");
/* FIXME: The sucking bit */
{
@@ -883,7 +883,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
}
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 (e_contact_editor->app);
e_contact_editor->app = bonobo_win;
}
@@ -891,7 +891,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
/* Build the menu and toolbar */
container = bonobo_ui_container_new ();
- bonobo_ui_container_set_win (container, BONOBO_WIN (e_contact_editor->app));
+ bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app));
e_contact_editor->uic = bonobo_ui_component_new_default ();
if (!e_contact_editor->uic) {
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 6401654751..3902cb0bc2 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -583,7 +583,7 @@ addressbook_factory_new_control (void)
view->properties, PROPERTY_FOLDER_URI, PROPERTY_FOLDER_URI_IDX,
BONOBO_ARG_STRING, NULL, _("The URI that the Folder Browser will display"), 0);
- bonobo_control_set_property_bag (view->control,
+ bonobo_control_set_properties (view->control,
view->properties);
view->uri = NULL;
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index 8c0e868bb1..d4e2d32cfc 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -174,7 +174,7 @@ impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
BONOBO_ARG_STRING, NULL, NULL,
BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
- bonobo_control_set_property_bag (control, property_bag);
+ bonobo_control_set_properties (control, property_bag);
return bonobo_object_corba_objref (BONOBO_OBJECT (control));
}
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index c0921a7204..aa2f4cffc2 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -869,7 +869,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
/* Construct the app */
- bonobo_win = bonobo_win_new ("contact-editor-dialog", "Contact Editor");
+ bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");
/* FIXME: The sucking bit */
{
@@ -883,7 +883,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
}
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 (e_contact_editor->app);
e_contact_editor->app = bonobo_win;
}
@@ -891,7 +891,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
/* Build the menu and toolbar */
container = bonobo_ui_container_new ();
- bonobo_ui_container_set_win (container, BONOBO_WIN (e_contact_editor->app));
+ bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app));
e_contact_editor->uic = bonobo_ui_component_new_default ();
if (!e_contact_editor->uic) {
diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c
index a5d2038a8a..d69f422f63 100644
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ b/addressbook/gui/widgets/e-minicard-control.c
@@ -295,7 +295,7 @@ e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)
#if 0
/* Create the properties. */
pb = bonobo_property_bag_new (get_prop, set_prop, clock);
- bonobo_control_set_property_bag (control, pb);
+ bonobo_control_set_properties (control, pb);
bonobo_property_bag_add (pb, "running", PROP_RUNNING,
BONOBO_ARG_BOOLEAN, NULL,
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)));
}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 59cdf40a38..dbf37ac0bb 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -645,7 +645,7 @@ menu_file_save_cb (BonoboUIComponent *uic,
CORBA_exception_init (&ev);
- file_name = Bonobo_PersistFile_get_current_file (composer->persist_file_interface, &ev);
+ file_name = Bonobo_PersistFile_getCurrentFile (composer->persist_file_interface, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
save (composer, NULL);
@@ -942,7 +942,7 @@ setup_ui (EMsgComposer *composer)
BonoboUIContainer *container;
container = bonobo_ui_container_new ();
- bonobo_ui_container_set_win (container, BONOBO_WIN (composer));
+ bonobo_ui_container_set_win (container, BONOBO_WINDOW (composer));
composer->uic = bonobo_ui_component_new ("evolution-message-composer");
bonobo_ui_component_set_container (
@@ -1103,7 +1103,7 @@ class_init (EMsgComposerClass *klass)
widget_class->delete_event = delete_event;
- parent_class = gtk_type_class (bonobo_win_get_type ());
+ parent_class = gtk_type_class (bonobo_window_get_type ());
signals[SEND] =
gtk_signal_new ("send",
@@ -1166,7 +1166,7 @@ e_msg_composer_get_type (void)
(GtkClassInitFunc) NULL,
};
- type = gtk_type_unique (bonobo_win_get_type (), &info);
+ type = gtk_type_unique (bonobo_window_get_type (), &info);
}
return type;
@@ -1193,7 +1193,7 @@ e_msg_composer_construct (EMsgComposer *composer)
gtk_window_set_default_size (GTK_WINDOW (composer),
DEFAULT_WIDTH, DEFAULT_HEIGHT);
- bonobo_win_construct (BONOBO_WIN (composer), "e-msg-composer",
+ bonobo_window_construct (BONOBO_WINDOW (composer), "e-msg-composer",
_("Compose a message"));
/* DND support */
@@ -1249,7 +1249,7 @@ e_msg_composer_construct (EMsgComposer *composer)
gtk_signal_connect (GTK_OBJECT (composer->attachment_bar), "changed",
GTK_SIGNAL_FUNC (attachment_bar_changed_cb), composer);
- bonobo_win_set_contents (BONOBO_WIN (composer), vbox);
+ bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);
gtk_widget_show (vbox);
e_msg_composer_show_attachments (composer, FALSE);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 391831d776..0f0a290760 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -49,7 +49,7 @@ extern "C" {
struct _EMsgComposer {
- BonoboWin parent;
+ BonoboWindow parent;
BonoboUIComponent *uic;
@@ -75,7 +75,7 @@ struct _EMsgComposer {
};
struct _EMsgComposerClass {
- BonoboWinClass parent_class;
+ BonoboWindowClass parent_class;
void (* send) (EMsgComposer *composer);
void (* postpone) (EMsgComposer *composer);
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 4593edee47..79105c18a0 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -134,9 +134,9 @@ control_activate_cb (BonoboControl *control,
}
CORBA_exception_init (&ev);
- shell_view_interface = Bonobo_Unknown_query_interface (control_frame,
- "IDL:Evolution/ShellView:1.0",
- &ev);
+ shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
+ "IDL:Evolution/ShellView:1.0",
+ &ev);
CORBA_exception_free (&ev);
if (shell_view_interface != CORBA_OBJECT_NIL) {
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index fae28cbcfb..10502557a6 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -1035,7 +1035,7 @@ retrieve_shell_view_interface_from_control (BonoboControl *control)
return CORBA_OBJECT_NIL;
CORBA_exception_init (&ev);
- shell_view_interface = Bonobo_Unknown_query_interface (control_frame,
+ shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
"IDL:Evolution/ShellView:1.0",
&ev);
CORBA_exception_free (&ev);
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index e74ab4f1bd..aa494058e7 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -962,11 +962,11 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
CORBA_exception_init (&ev);
/* Construct the app */
- sc->app = bonobo_win_new ("subscribe-dialog", "Manage Subscriptions");
+ sc->app = bonobo_window_new ("subscribe-dialog", "Manage Subscriptions");
/* Build the menu and toolbar */
container = bonobo_ui_container_new ();
- bonobo_ui_container_set_win (container, BONOBO_WIN (sc->app));
+ bonobo_ui_container_set_win (container, BONOBO_WINDOW (sc->app));
/* set up the bonobo stuff */
component = bonobo_ui_component_new_default ();
@@ -1092,7 +1092,7 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
e_paned_add2 (E_PANED (sc->hpaned), sc->table);
e_paned_set_position (E_PANED (sc->hpaned), DEFAULT_STORE_TABLE_WIDTH);
- bonobo_win_set_contents (BONOBO_WIN (sc->app), sc->hpaned);
+ bonobo_window_set_contents (BONOBO_WINDOW (sc->app), sc->hpaned);
#if 0
gtk_widget_show (sc->description);
diff --git a/mail/test-mail.c b/mail/test-mail.c
index c62df3ac3e..917f2a2a2a 100644
--- a/mail/test-mail.c
+++ b/mail/test-mail.c
@@ -24,12 +24,12 @@ create_container (void)
gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
gtk_widget_set_default_visual (gdk_rgb_get_visual ());
- window = bonobo_win_new ("Test", "test");
+ window = bonobo_window_new ("Test", "test");
gtk_widget_set_usize (GTK_WIDGET (window), 640, 480);
gtk_widget_show (GTK_WIDGET (window));
container = bonobo_ui_container_new ();
- bonobo_ui_container_set_win (BONOBO_WIN (window), container);
+ bonobo_ui_container_set_win (BONOBO_WINDOW (window), container);
control = bonobo_widget_new_control (
"OAFIID:control:evolution-mail:833d5a71-a201-4a0e-b7e6-5475c5c4cb45",
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 37cb1909ab..e2906b2fbf 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -370,7 +370,7 @@ static void
command_xml_dump (gpointer dummy,
EShellView *view)
{
- bonobo_win_dump (BONOBO_WIN (view), "On demand");
+ bonobo_window_dump (BONOBO_WINDOW (view), "On demand");
}
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 45f4fa0ef7..f3ce68ad07 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -56,7 +56,7 @@
#include <gal/e-paned/e-hpaned.h>
-static BonoboWinClass *parent_class = NULL;
+static BonoboWindowClass *parent_class = NULL;
struct _EShellViewPrivate {
/* The shell. */
@@ -508,7 +508,7 @@ setup_widgets (EShellView *shell_view)
e_paned_add2 (E_PANED (priv->hpaned), priv->view_vbox);
e_paned_set_position (E_PANED (priv->hpaned), DEFAULT_SHORTCUT_BAR_WIDTH);
- bonobo_win_set_contents (BONOBO_WIN (shell_view), priv->hpaned);
+ bonobo_window_set_contents (BONOBO_WINDOW (shell_view), priv->hpaned);
/* Show stuff. */
@@ -618,7 +618,7 @@ class_init (EShellViewClass *klass)
object_class->destroy = destroy;
- parent_class = gtk_type_class (BONOBO_TYPE_WIN);
+ parent_class = gtk_type_class (BONOBO_TYPE_WINDOW);
signals[SHORTCUT_BAR_MODE_CHANGED]
= gtk_signal_new ("shortcut_bar_mode_changed",
@@ -842,7 +842,7 @@ e_shell_view_construct (EShellView *shell_view,
priv = shell_view->priv;
- view = E_SHELL_VIEW (bonobo_win_construct (BONOBO_WIN (shell_view), "evolution", "Evolution"));
+ view = E_SHELL_VIEW (bonobo_window_construct (BONOBO_WINDOW (shell_view), "evolution", "Evolution"));
if (!view) {
gtk_object_unref (GTK_OBJECT (shell_view));
@@ -859,7 +859,7 @@ e_shell_view_construct (EShellView *shell_view,
priv->shell = shell;
container = bonobo_ui_container_new ();
- bonobo_ui_container_set_win (container, BONOBO_WIN (shell_view));
+ bonobo_ui_container_set_win (container, BONOBO_WINDOW (shell_view));
priv->ui_component = bonobo_ui_component_new ("evolution");
bonobo_ui_component_set_container (priv->ui_component,
@@ -1337,7 +1337,7 @@ e_shell_view_display_uri (EShellView *shell_view,
priv = shell_view->priv;
- bonobo_win_freeze (BONOBO_WIN (shell_view));
+ bonobo_window_freeze (BONOBO_WINDOW (shell_view));
if (uri == NULL) {
gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
@@ -1380,7 +1380,7 @@ e_shell_view_display_uri (EShellView *shell_view,
end:
update_for_current_uri (shell_view);
- bonobo_win_thaw (BONOBO_WIN (shell_view));
+ bonobo_window_thaw (BONOBO_WINDOW (shell_view));
return retval;
}
@@ -1619,4 +1619,4 @@ e_shell_view_load_settings (EShellView *shell_view,
}
-E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, class_init, init, BONOBO_TYPE_WIN)
+E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, class_init, init, BONOBO_TYPE_WINDOW)
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 09b7a44f47..d3eb889fec 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -56,13 +56,13 @@ enum _EShellViewSubwindowMode {
typedef enum _EShellViewSubwindowMode EShellViewSubwindowMode;
struct _EShellView {
- BonoboWin parent;
+ BonoboWindow parent;
EShellViewPrivate *priv;
};
struct _EShellViewClass {
- BonoboWinClass parent_class;
+ BonoboWindowClass parent_class;
/* Signals. */
void (* shortcut_bar_mode_changed) (EShellView *shell_view, EShellViewSubwindowMode new_mode);
diff --git a/shell/e-shell.c b/shell/e-shell.c
index dc355c85e7..6ae909a25f 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -892,7 +892,7 @@ save_settings_for_component (EShell *shell,
CORBA_exception_init (&ev);
- session_interface = Bonobo_Unknown_query_interface (unknown_interface, "IDL:Evolution/Session:1.0", &ev);
+ session_interface = Bonobo_Unknown_queryInterface (unknown_interface, "IDL:Evolution/Session:1.0", &ev);
if (ev._major != CORBA_NO_EXCEPTION || CORBA_Object_is_nil (session_interface, &ev)) {
CORBA_exception_free (&ev);
return TRUE;
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index 1ca69da867..f9127c56c0 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -459,7 +459,7 @@ evolution_storage_register_on_shell (EvolutionStorage *evolution_storage,
CORBA_exception_init (&ev);
- corba_storage_registry = Bonobo_Unknown_query_interface (corba_shell,
+ corba_storage_registry = Bonobo_Unknown_queryInterface (corba_shell,
"IDL:Evolution/StorageRegistry:1.0",
&ev);
if (corba_storage_registry == CORBA_OBJECT_NIL || ev._major != CORBA_NO_EXCEPTION) {