diff options
Diffstat (limited to 'executive-summary/evolution-services')
4 files changed, 21 insertions, 19 deletions
diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c index 7c0477af41..ecd806af52 100644 --- a/executive-summary/evolution-services/executive-summary-component-client.c +++ b/executive-summary/evolution-services/executive-summary-component-client.c @@ -201,26 +201,30 @@ executive_summary_component_client_supports (ExecutiveSummaryComponentClient *cl #endif ExecutiveSummaryComponentView * -executive_summary_component_client_create_view (ExecutiveSummaryComponentClient *client) +executive_summary_component_client_create_view (ExecutiveSummaryComponentClient *client, + int id) { ExecutiveSummaryComponentView *view; Evolution_SummaryComponent component; char *html, *title, *icon; Bonobo_Control control; BonoboControl *bc; - int id; + int ret_id; CORBA_Environment ev; - + g_return_val_if_fail (client != NULL, NULL); g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client), NULL); CORBA_exception_init (&ev); - component = bonobo_object_corba_objref (BONOBO_OBJECT (client)); + if (client) + component = bonobo_object_corba_objref (BONOBO_OBJECT (client)); /* Get all the details about the view */ - id = Evolution_SummaryComponent_create_view (component, &control, - &html, &title, &icon, &ev); + g_print ("In %s\n", __FUNCTION__); + ret_id = Evolution_SummaryComponent_create_view (component, id, &control, + &html, &title, &icon, &ev); + g_print ("Out %s\n", __FUNCTION__); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Error creating view"); CORBA_exception_free (&ev); @@ -238,7 +242,7 @@ executive_summary_component_client_create_view (ExecutiveSummaryComponentClient view = executive_summary_component_view_new (NULL, bc, html, title, icon); - executive_summary_component_view_set_id (view, id); + executive_summary_component_view_set_id (view, ret_id); return view; } @@ -301,7 +305,8 @@ executive_summary_component_client_configure (ExecutiveSummaryComponentClient *c void executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client, - ExecutiveSummaryComponentView *view) { + ExecutiveSummaryComponentView *view) +{ int id; Evolution_SummaryComponent component; CORBA_Environment ev; diff --git a/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h index 849bec6c99..3a9edd7a1c 100644 --- a/executive-summary/evolution-services/executive-summary-component-client.h +++ b/executive-summary/evolution-services/executive-summary-component-client.h @@ -26,6 +26,7 @@ #include <bonobo.h> #include <evolution-services/executive-summary.h> +#include <evolution-services/executive-summary-component-view.h> #define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ()) #define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient)) @@ -57,14 +58,10 @@ void executive_summary_component_client_unset_owner (ExecutiveSummaryComponentCl void executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client, gboolean *bonobo, gboolean *html); -Bonobo_Control executive_summary_component_client_create_bonobo_view (ExecutiveSummaryComponentClient *client, - char **title, - char **icon); - -char *executive_summary_component_client_create_html_view (ExecutiveSummaryComponentClient *client, - char **title, - char **icon); void executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client); +void executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client, + ExecutiveSummaryComponentView *view); #endif + diff --git a/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c index b61b69a7fa..ebcbeb9e09 100644 --- a/executive-summary/evolution-services/executive-summary-component-view.c +++ b/executive-summary/evolution-services/executive-summary-component-view.c @@ -314,7 +314,7 @@ executive_summary_component_view_get_control (ExecutiveSummaryComponentView *vie priv = view->private; - return BONOBO_OBJECT (priv->control); + return priv->control; } void diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c index 116736f051..c07afc498a 100644 --- a/executive-summary/evolution-services/executive-summary-component.c +++ b/executive-summary/evolution-services/executive-summary-component.c @@ -145,6 +145,7 @@ impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant, static CORBA_long impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant, + CORBA_long id, Bonobo_Control *control, CORBA_char **html, CORBA_char **title, @@ -157,14 +158,12 @@ impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant, ExecutiveSummaryComponentPrivate *priv; BonoboObject *initial_control; const char *initial_title, *initial_icon, *initial_html; - int id; bonobo_object = bonobo_object_from_servant (servant); component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object); priv = component->private; view = gtk_type_new (executive_summary_component_view_get_type ()); - id = executive_summary_component_create_unique_id (); executive_summary_component_view_set_id (view, id); (* priv->create_view) (component, view, priv->closure); @@ -182,7 +181,7 @@ impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant, if (initial_control != NULL) { *control = bonobo_object_corba_objref (BONOBO_OBJECT (initial_control)); } else { - *control = NULL; + *control = CORBA_OBJECT_NIL; } *html = CORBA_string_dup (initial_html ? initial_html:""); @@ -498,5 +497,6 @@ executive_summary_component_create_unique_id (void) static int id = 0; id++; + g_print ("%s -- %d\n", __FUNCTION__, id); return id; } |