diff options
| -rw-r--r-- | composer/ChangeLog | 7 | ||||
| -rw-r--r-- | composer/evolution-composer.c | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index d7949d1f6a..75a183b1e0 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2001-01-17 Michael Meeks <michael@helixcode.com> + + * evolution-composer.c (enum_objects): comment out for now + to ease compat issues. + (evolution_composer_construct): pass in NULL for the item + handler enum_objects fn + calm warning. + 2001-01-17 JP Rosevear <jpr@ximian.com> * e-msg-composer.c (e_msg_composer_new_with_message): Use the diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c index 3ad6a6d51a..0d8af6eed9 100644 --- a/composer/evolution-composer.c +++ b/composer/evolution-composer.c @@ -246,12 +246,12 @@ init (EvolutionComposer *composer) GTK_SIGNAL_FUNC (postpone_cb), NULL); } - -static Bonobo_ItemContainer_ObjectList * +#if 0 +static Bonobo_ItemContainer_ObjectNames * enum_objects (BonoboItemHandler *handler, gpointer data, CORBA_Environment *ev) { -#warning "This function is not implemented because enumObjects has a broken CORBA prototype"); } +#endif static Bonobo_Unknown get_object (BonoboItemHandler *h, const char *item_name, gboolean only_if_exists, @@ -292,7 +292,8 @@ evolution_composer_construct (EvolutionComposer *composer, bonobo_object_construct (BONOBO_OBJECT (composer), corba_object); - item_handler = bonobo_item_handler_new (enum_objects, get_object, composer); + item_handler = BONOBO_OBJECT ( + bonobo_item_handler_new (NULL, get_object, composer)); bonobo_object_add_interface (BONOBO_OBJECT (composer), BONOBO_OBJECT (item_handler)); } |