diff options
Diffstat (limited to 'executive-summary/evolution-services')
6 files changed, 82 insertions, 82 deletions
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am index 09b19f6bc9..cbe9d99a55 100644 --- a/executive-summary/evolution-services/Makefile.am +++ b/executive-summary/evolution-services/Makefile.am @@ -31,8 +31,8 @@ IDLS = \ $(srcdir)/../idl/SummaryComponent.idl $(IDL_GENERATED): $(IDLS) - $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ - -I$(srcdir) $(srcdir)/../idl/Executive-Summary.idl + $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + $(srcdir)/../idl/Executive-Summary.idl libevolution_services_la_SOURCES = \ $(IDL_GENERATED) \ diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c index 88796d1753..145e385c1a 100644 --- a/executive-summary/evolution-services/executive-summary-client.c +++ b/executive-summary/evolution-services/executive-summary-client.c @@ -98,13 +98,13 @@ executive_summary_client_set_title (ExecutiveSummaryClient *client, int id, const char *title) { - Evolution_Summary summary; + GNOME_Evolution_Summary_ViewFrame summary; CORBA_Environment ev; CORBA_exception_init (&ev); summary = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_Summary_set_title (summary, id, title, &ev); + GNOME_Evolution_Summary_ViewFrame_setTitle (summary, id, title, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error setting title to %s:%s", title, CORBA_exception_id (&ev)); @@ -118,13 +118,13 @@ executive_summary_client_set_icon (ExecutiveSummaryClient *client, int id, const char *icon) { - Evolution_Summary summary; + GNOME_Evolution_Summary_ViewFrame summary; CORBA_Environment ev; CORBA_exception_init (&ev); summary = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_Summary_set_icon (summary, id, icon, &ev); + GNOME_Evolution_Summary_ViewFrame_setIcon (summary, id, icon, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error setting icon to %s:%s", icon, CORBA_exception_id (&ev)); @@ -137,13 +137,13 @@ void executive_summary_client_flash (ExecutiveSummaryClient *client, int id) { - Evolution_Summary summary; + GNOME_Evolution_Summary_ViewFrame summary; CORBA_Environment ev; CORBA_exception_init (&ev); summary = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_Summary_flash (summary, id, &ev); + GNOME_Evolution_Summary_ViewFrame_flash (summary, id, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error flashing"); @@ -157,13 +157,13 @@ executive_summary_client_update (ExecutiveSummaryClient *client, int id, const char *html) { - Evolution_Summary summary; + GNOME_Evolution_Summary_ViewFrame summary; CORBA_Environment ev; CORBA_exception_init (&ev); summary = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_Summary_update_component (summary, id, html, &ev); + GNOME_Evolution_Summary_ViewFrame_updateComponent (summary, id, html, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error updating the component"); } diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c index ecd806af52..5d13a39e6d 100644 --- a/executive-summary/evolution-services/executive-summary-component-client.c +++ b/executive-summary/evolution-services/executive-summary-component-client.c @@ -128,8 +128,8 @@ void executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client, ExecutiveSummary *summary) { - Evolution_SummaryComponent component; - Evolution_Summary corba_object; + GNOME_Evolution_Summary_Component component; + GNOME_Evolution_Summary_ViewFrame corba_object; CORBA_Environment ev; g_return_if_fail (client != NULL); @@ -142,7 +142,7 @@ executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *c corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (summary)); g_return_if_fail (corba_object != CORBA_OBJECT_NIL); - Evolution_SummaryComponent_set_owner (component, corba_object, &ev); + GNOME_Evolution_Summary_Component_setOwner (component, corba_object, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error setting owner"); @@ -155,7 +155,7 @@ executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *c void executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client) { - Evolution_SummaryComponent component; + GNOME_Evolution_Summary_Component component; CORBA_Environment ev; g_return_if_fail (client != NULL); @@ -164,7 +164,7 @@ executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient CORBA_exception_init (&ev); component = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_SummaryComponent_unset_owner (component, &ev); + GNOME_Evolution_Summary_Component_unsetOwner (component, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error unsetting owner"); @@ -180,7 +180,7 @@ executive_summary_component_client_supports (ExecutiveSummaryComponentClient *cl gboolean *bonobo, gboolean *html) { - Evolution_SummaryComponent component; + GNOME_Evolution_Summary_Component component; CORBA_Environment ev; g_return_if_fail (client != NULL); @@ -189,7 +189,7 @@ executive_summary_component_client_supports (ExecutiveSummaryComponentClient *cl CORBA_exception_init (&ev); component = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_SummaryComponent_supports (component, bonobo, html, &ev); + GNOME_Evolution_Summary_Component_supports (component, bonobo, html, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error checking supports"); @@ -205,7 +205,7 @@ executive_summary_component_client_create_view (ExecutiveSummaryComponentClient int id) { ExecutiveSummaryComponentView *view; - Evolution_SummaryComponent component; + GNOME_Evolution_Summary_Component component; char *html, *title, *icon; Bonobo_Control control; BonoboControl *bc; @@ -222,8 +222,8 @@ executive_summary_component_client_create_view (ExecutiveSummaryComponentClient /* Get all the details about the view */ g_print ("In %s\n", __FUNCTION__); - ret_id = Evolution_SummaryComponent_create_view (component, id, &control, - &html, &title, &icon, &ev); + ret_id = GNOME_Evolution_Summary_Component_createView (component, id, &control, + &html, &title, &icon, &ev); g_print ("Out %s\n", __FUNCTION__); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error creating view"); @@ -254,7 +254,7 @@ executive_summary_component_client_create_html_view (ExecutiveSummaryComponentCl char **icon) { CORBA_char *ret_html; - Evolution_SummaryComponent component; + GNOME_Evolution_Summary_Component component; CORBA_Environment ev; g_return_val_if_fail (client != NULL, NULL); @@ -264,7 +264,7 @@ executive_summary_component_client_create_html_view (ExecutiveSummaryComponentCl CORBA_exception_init (&ev); component = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - ret_html = Evolution_SummaryComponent_create_html_view (component, title, icon, &ev); + ret_html = GNOME_Evolution_Summary_Component_create_html_view (component, title, icon, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error creating HTML view"); @@ -281,7 +281,7 @@ executive_summary_component_client_create_html_view (ExecutiveSummaryComponentCl void executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client) { - Evolution_SummaryComponent component; + GNOME_Evolution_Summary_Component component; CORBA_Environment ev; g_return_if_fail (client != NULL); @@ -289,7 +289,7 @@ executive_summary_component_client_configure (ExecutiveSummaryComponentClient *c CORBA_exception_init (&ev); component = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_SummaryComponent_configure (component, &ev); + GNOME_Evolution_Summary_Component_configure (component, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error configuring service"); @@ -308,7 +308,7 @@ executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient ExecutiveSummaryComponentView *view) { int id; - Evolution_SummaryComponent component; + GNOME_Evolution_Summary_Component component; CORBA_Environment ev; g_return_if_fail (client != NULL); @@ -320,7 +320,7 @@ executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient CORBA_exception_init (&ev); component = bonobo_object_corba_objref (BONOBO_OBJECT (client)); - Evolution_SummaryComponent_destroy_view (component, id, &ev); + GNOME_Evolution_Summary_Component_destroyView (component, id, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error destroying view #%d", id); diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c index c07afc498a..ba0c3b7832 100644 --- a/executive-summary/evolution-services/executive-summary-component.c +++ b/executive-summary/evolution-services/executive-summary-component.c @@ -56,19 +56,19 @@ struct _ExecutiveSummaryComponentPrivate { }; /* CORBA interface */ -static POA_Evolution_SummaryComponent__vepv SummaryComponent_vepv; +static POA_GNOME_Evolution_Summary_Component__vepv SummaryComponent_vepv; -static POA_Evolution_SummaryComponent * +static POA_GNOME_Evolution_Summary_Component * create_servant (void) { - POA_Evolution_SummaryComponent *servant; + POA_GNOME_Evolution_Summary_Component *servant; CORBA_Environment ev; - servant = (POA_Evolution_SummaryComponent *)g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Summary_Component *)g_new0 (BonoboObjectServant, 1); servant->vepv = &SummaryComponent_vepv; CORBA_exception_init (&ev); - POA_Evolution_SummaryComponent__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Summary_Component__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -82,7 +82,7 @@ create_servant (void) #if 0 static void -impl_Evolution_SummaryComponent_supports (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_Component_supports (PortableServer_Servant servant, CORBA_boolean *html, CORBA_boolean *bonobo, CORBA_Environment *ev) @@ -101,15 +101,15 @@ impl_Evolution_SummaryComponent_supports (PortableServer_Servant servant, #endif static void -impl_Evolution_SummaryComponent_set_owner (PortableServer_Servant servant, - Evolution_Summary summary, +impl_GNOME_Evolution_Summary_Component_set_owner (PortableServer_Servant servant, + GNOME_Evolution_Summary_ViewFrame summary, CORBA_Environment *ev) { BonoboObject *bonobo_object; ExecutiveSummaryComponent *component; ExecutiveSummaryComponentPrivate *priv; ExecutiveSummaryClient *client; - Evolution_Summary summary_duplicate; + GNOME_Evolution_Summary_ViewFrame summary_duplicate; bonobo_object = bonobo_object_from_servant (servant); component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object); @@ -125,7 +125,7 @@ impl_Evolution_SummaryComponent_set_owner (PortableServer_Servant servant, } static void -impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_Component_unset_owner (PortableServer_Servant servant, CORBA_Environment *ev) { BonoboObject *bonobo_object; @@ -144,7 +144,7 @@ impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant, } static CORBA_long -impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_Component_create_view (PortableServer_Servant servant, CORBA_long id, Bonobo_Control *control, CORBA_char **html, @@ -193,7 +193,7 @@ impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant, #if 0 static CORBA_char * -impl_Evolution_SummaryComponent_create_html_view (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_Component_create_html_view (PortableServer_Servant servant, CORBA_char **title, CORBA_char **icon, CORBA_Environment *ev) @@ -225,7 +225,7 @@ impl_Evolution_SummaryComponent_create_html_view (PortableServer_Servant servant #endif static void -impl_Evolution_SummaryComponent_destroy_view (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_Component_destroy_view (PortableServer_Servant servant, CORBA_long id, CORBA_Environment *ev) { @@ -250,7 +250,7 @@ impl_Evolution_SummaryComponent_destroy_view (PortableServer_Servant servant, } static void -impl_Evolution_SummaryComponent_configure (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_Component_configure (PortableServer_Servant servant, CORBA_Environment *ev) { BonoboObject *bonobo_object; @@ -296,8 +296,8 @@ executive_summary_component_destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_SummaryComponent__vepv *vepv; - POA_Evolution_SummaryComponent__epv *epv; + POA_GNOME_Evolution_Summary_Component__vepv *vepv; + POA_GNOME_Evolution_Summary_Component__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -305,17 +305,17 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_SummaryComponent__epv, 1); - epv->set_owner = impl_Evolution_SummaryComponent_set_owner; - epv->unset_owner = impl_Evolution_SummaryComponent_unset_owner; - epv->create_view = impl_Evolution_SummaryComponent_create_view; - epv->destroy_view = impl_Evolution_SummaryComponent_destroy_view; - epv->configure = impl_Evolution_SummaryComponent_configure; + epv = g_new0 (POA_GNOME_Evolution_Summary_Component__epv, 1); + epv->setOwner = impl_GNOME_Evolution_Summary_Component_set_owner; + epv->unsetOwner = impl_GNOME_Evolution_Summary_Component_unset_owner; + epv->createView = impl_GNOME_Evolution_Summary_Component_create_view; + epv->destroyView = impl_GNOME_Evolution_Summary_Component_destroy_view; + epv->configure = impl_GNOME_Evolution_Summary_Component_configure; vepv = &SummaryComponent_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_SummaryComponent_epv = epv; + vepv->GNOME_Evolution_Summary_Component_epv = epv; } static void @@ -350,7 +350,7 @@ executive_summary_component_init (ExecutiveSummaryComponent *component) static void executive_summary_component_construct (ExecutiveSummaryComponent *component, - Evolution_SummaryComponent corba_object, + GNOME_Evolution_Summary_Component corba_object, EvolutionServicesCreateViewFn create_view, EvolutionServicesConfigureFn configure, void *closure) @@ -376,8 +376,8 @@ executive_summary_component_new (EvolutionServicesCreateViewFn create_view, void *closure) { ExecutiveSummaryComponent *component; - POA_Evolution_SummaryComponent *servant; - Evolution_SummaryComponent corba_object; + POA_GNOME_Evolution_Summary_Component *servant; + GNOME_Evolution_Summary_Component corba_object; servant = create_servant (); if (servant == NULL) diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c index f8a0f7ecf8..1f717cc0b4 100644 --- a/executive-summary/evolution-services/executive-summary.c +++ b/executive-summary/evolution-services/executive-summary.c @@ -54,20 +54,20 @@ struct _ExecutiveSummaryPrivate { }; /* CORBA interface implementation */ -static POA_Evolution_Summary__vepv Summary_vepv; +static POA_GNOME_Evolution_Summary_ViewFrame__vepv Summary_vepv; -static POA_Evolution_Summary * +static POA_GNOME_Evolution_Summary_ViewFrame * create_servant (void) { - POA_Evolution_Summary *servant; + POA_GNOME_Evolution_Summary_ViewFrame *servant; CORBA_Environment ev; - servant = (POA_Evolution_Summary *)g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Summary_ViewFrame *)g_new0 (BonoboObjectServant, 1); servant->vepv = &Summary_vepv; CORBA_exception_init (&ev); - POA_Evolution_Summary__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Summary_ViewFrame__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); @@ -80,7 +80,7 @@ create_servant (void) } static void -impl_Evolution_Summary_set_title (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_ViewFrame_setTitle (PortableServer_Servant servant, CORBA_long id, const CORBA_char *title, CORBA_Environment *ev) @@ -96,7 +96,7 @@ impl_Evolution_Summary_set_title (PortableServer_Servant servant, } static void -impl_Evolution_Summary_set_icon (PortableServer_Servant servant, +impl_GNOME_Evolution_Summary_ViewFrame_setIcon (PortableServer_Servant servant, CORBA_long id, const CORBA_char *title, CORBA_Environment *ev) @@ -112,9 +112,9 @@ impl_Evolution_Summary_set_icon (PortableServer_Servant servant, } static void -impl_Evolution_Summary_flash (PortableServer_Servant servant, - CORBA_long id, - CORBA_Environment *ev) +impl_GNOME_Evolution_Summary_ViewFrame_flash (PortableServer_Servant servant, + CORBA_long id, + CORBA_Environment *ev) { BonoboObject *bonobo_object; ExecutiveSummary *summary; @@ -126,10 +126,10 @@ impl_Evolution_Summary_flash (PortableServer_Servant servant, } static void -impl_Evolution_Summary_update_component (PortableServer_Servant servant, - CORBA_long id, - CORBA_char *html, - CORBA_Environment *ev) +impl_GNOME_Evolution_Summary_ViewFrame_updateComponent (PortableServer_Servant servant, + const CORBA_long id, + const CORBA_char *html, + CORBA_Environment *ev) { BonoboObject *bonobo_object; ExecutiveSummary *summary; @@ -163,8 +163,8 @@ executive_summary_destroy (GtkObject *object) static void corba_class_init (void) { - POA_Evolution_Summary__vepv *vepv; - POA_Evolution_Summary__epv *epv; + POA_GNOME_Evolution_Summary_ViewFrame__vepv *vepv; + POA_GNOME_Evolution_Summary_ViewFrame__epv *epv; PortableServer_ServantBase__epv *base_epv; base_epv = g_new0 (PortableServer_ServantBase__epv, 1); @@ -172,16 +172,16 @@ corba_class_init (void) base_epv->finalize = NULL; base_epv->default_POA = NULL; - epv = g_new0 (POA_Evolution_Summary__epv, 1); - epv->set_title = impl_Evolution_Summary_set_title; - epv->set_icon = impl_Evolution_Summary_set_icon; - epv->flash = impl_Evolution_Summary_flash; - epv->update_component = impl_Evolution_Summary_update_component; + epv = g_new0 (POA_GNOME_Evolution_Summary_ViewFrame__epv, 1); + epv->setTitle = impl_GNOME_Evolution_Summary_ViewFrame_setTitle; + epv->setIcon = impl_GNOME_Evolution_Summary_ViewFrame_setIcon; + epv->flash = impl_GNOME_Evolution_Summary_ViewFrame_flash; + epv->updateComponent = impl_GNOME_Evolution_Summary_ViewFrame_updateComponent; vepv = &Summary_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - vepv->Evolution_Summary_epv = epv; + vepv->GNOME_Evolution_Summary_ViewFrame_epv = epv; } static void @@ -245,7 +245,7 @@ E_MAKE_TYPE (executive_summary, "ExecutiveSummary", ExecutiveSummary, void executive_summary_construct (ExecutiveSummary *es, - Evolution_Summary corba_object) + GNOME_Evolution_Summary_ViewFrame corba_object) { bonobo_object_construct (BONOBO_OBJECT (es), corba_object); } @@ -253,8 +253,8 @@ executive_summary_construct (ExecutiveSummary *es, BonoboObject * executive_summary_new (void) { - POA_Evolution_Summary *servant; - Evolution_Summary corba_object; + POA_GNOME_Evolution_Summary_ViewFrame *servant; + GNOME_Evolution_Summary_ViewFrame corba_object; ExecutiveSummary *es; servant = create_servant (); diff --git a/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h index 4f6b959a9c..23765044f4 100644 --- a/executive-summary/evolution-services/executive-summary.h +++ b/executive-summary/evolution-services/executive-summary.h @@ -48,20 +48,20 @@ struct _ExecutiveSummaryClass { BonoboObjectClass parent_class; void (* update) (ExecutiveSummary *summary, - const Evolution_SummaryComponent component, + const GNOME_Evolution_Summary_Component component, const char *html); void (* set_title) (ExecutiveSummary *summary, - const Evolution_SummaryComponent component, + const GNOME_Evolution_Summary_Component component, const char *title); void (* set_icon) (ExecutiveSummary *summary, - const Evolution_SummaryComponent component, + const GNOME_Evolution_Summary_Component component, const char *icon); void (* flash) (ExecutiveSummary *summary, - const Evolution_SummaryComponent component); + const GNOME_Evolution_Summary_Component component); }; GtkType executive_summary_get_type (void); void executive_summary_construct (ExecutiveSummary *es, - Evolution_Summary corba_object); + GNOME_Evolution_Summary_ViewFrame corba_object); BonoboObject *executive_summary_new (void); #endif |