aboutsummaryrefslogtreecommitdiffstats
path: root/executive-summary
diff options
context:
space:
mode:
Diffstat (limited to 'executive-summary')
-rw-r--r--executive-summary/component/Makefile.am4
-rw-r--r--executive-summary/component/component-factory.c4
-rw-r--r--executive-summary/component/e-summary-factory.c4
-rw-r--r--executive-summary/component/e-summary-factory.h2
-rw-r--r--executive-summary/component/e-summary-url.c20
-rw-r--r--executive-summary/component/e-summary.c28
-rw-r--r--executive-summary/component/e-summary.h4
-rw-r--r--executive-summary/evolution-services/Makefile.am4
-rw-r--r--executive-summary/evolution-services/executive-summary-client.c16
-rw-r--r--executive-summary/evolution-services/executive-summary-component-client.c32
-rw-r--r--executive-summary/evolution-services/executive-summary-component.c52
-rw-r--r--executive-summary/evolution-services/executive-summary.c50
-rw-r--r--executive-summary/evolution-services/executive-summary.h10
-rw-r--r--executive-summary/idl/Summary.idl22
-rw-r--r--executive-summary/idl/SummaryComponent.idl32
15 files changed, 146 insertions, 138 deletions
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 5b3f147dfd..b580823455 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -32,8 +32,8 @@ COMPOSER_GENERATED = \
Composer-impl.o: Composer.h
$(COMPOSER_GENERATED):
- $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
- -I$(srcdir) $(top_srcdir)/composer/Composer.idl
+ $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
+ $(top_srcdir)/composer/Composer.idl
evolution_executive_summary_SOURCES = \
$(COMPOSER_GENERATED) \
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
index 9af99c7e67..ad381fb51a 100644
--- a/executive-summary/component/component-factory.c
+++ b/executive-summary/component/component-factory.c
@@ -60,7 +60,7 @@ create_view (EvolutionShellComponent *shell_component,
void *closure)
{
EvolutionShellClient *shell_client;
- Evolution_Shell corba_shell;
+ GNOME_Evolution_Shell corba_shell;
BonoboControl *control;
if (g_strcasecmp (folder_type, "executive-summary") != 0)
@@ -84,7 +84,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
const char *evolution_homedir,
gpointer user_data)
{
- Evolution_Shell corba_shell;
+ GNOME_Evolution_Shell corba_shell;
evolution_dir = g_strdup (evolution_homedir);
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
index 79105c18a0..5ff8a54dc9 100644
--- a/executive-summary/component/e-summary-factory.c
+++ b/executive-summary/component/e-summary-factory.c
@@ -121,7 +121,7 @@ control_activate_cb (BonoboControl *control,
ESummary *summary;
BonoboUIComponent *ui_component;
Bonobo_ControlFrame control_frame;
- Evolution_ShellView shell_view_interface;
+ GNOME_Evolution_ShellView shell_view_interface;
CORBA_Environment ev;
ui_component = bonobo_control_get_ui_component (control);
@@ -269,7 +269,7 @@ e_summary_factory_embed_service_from_id (ESummary *esummary,
BonoboControl *
e_summary_factory_new_control (const char *uri,
- const Evolution_Shell shell)
+ const GNOME_Evolution_Shell shell)
{
BonoboControl *control;
GtkWidget *esummary;
diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h
index 175988a78c..4c704e46ee 100644
--- a/executive-summary/component/e-summary-factory.h
+++ b/executive-summary/component/e-summary-factory.h
@@ -28,7 +28,7 @@
#include "e-summary.h"
BonoboControl *e_summary_factory_new_control (const char *uri,
- const Evolution_Shell shell);
+ const GNOME_Evolution_Shell shell);
void e_summary_factory_embed_service_from_id (ESummary *esummary,
const char *obj_id);
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
index c07a3efc99..9dfff28713 100644
--- a/executive-summary/component/e-summary-url.c
+++ b/executive-summary/component/e-summary-url.c
@@ -443,8 +443,8 @@ e_summary_url_mail_compose (ESummary *esummary,
{
CORBA_Object composer;
CORBA_Environment ev;
- Evolution_Composer_RecipientList *to, *cc, *bcc;
- Evolution_Composer_Recipient *recipient;
+ GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc;
+ GNOME_Evolution_Composer_Recipient *recipient;
char *address, *proto;
CORBA_char *subject;
@@ -467,30 +467,30 @@ e_summary_url_mail_compose (ESummary *esummary,
address = (char *) url;
}
- to = Evolution_Composer_RecipientList__alloc ();
+ to = GNOME_Evolution_Composer_RecipientList__alloc ();
to->_length = 1;
to->_maximum = 1;
- to->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (to->_maximum);
+ to->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to->_maximum);
recipient = to->_buffer;
recipient->name = CORBA_string_dup ("");
recipient->address = CORBA_string_dup (address?address:"");
/* FIXME: Get these out of the URL */
- cc = Evolution_Composer_RecipientList__alloc ();
+ cc = GNOME_Evolution_Composer_RecipientList__alloc ();
cc->_length = 0;
cc->_maximum = 0;
- cc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
+ cc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
- bcc = Evolution_Composer_RecipientList__alloc ();
+ bcc = GNOME_Evolution_Composer_RecipientList__alloc ();
bcc->_length = 0;
bcc->_maximum = 0;
- bcc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
+ bcc->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
subject = CORBA_string_dup ("");
CORBA_exception_init (&ev);
- Evolution_Composer_set_headers (composer, to, cc, bcc, subject, &ev);
+ GNOME_Evolution_Composer_setHeaders (composer, to, cc, bcc, subject, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
CORBA_exception_free (&ev);
CORBA_free (to);
@@ -501,7 +501,7 @@ e_summary_url_mail_compose (ESummary *esummary,
CORBA_free (to);
CORBA_exception_init (&ev);
- Evolution_Composer_show (composer, &ev);
+ GNOME_Evolution_Composer_show (composer, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
CORBA_exception_free (&ev);
g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
index dca8f98f0f..46ea9cbae1 100644
--- a/executive-summary/component/e-summary.c
+++ b/executive-summary/component/e-summary.c
@@ -45,8 +45,8 @@ extern char *evolution_dir;
static GtkObjectClass *e_summary_parent_class;
struct _ESummaryPrivate {
- Evolution_Shell shell;
- Evolution_ShellView shell_view_interface;
+ GNOME_Evolution_Shell shell;
+ GNOME_Evolution_ShellView shell_view_interface;
GtkWidget *html_scroller;
GtkWidget *html;
@@ -214,7 +214,7 @@ E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,
e_summary_init, PARENT_TYPE);
GtkWidget *
-e_summary_new (const Evolution_Shell shell)
+e_summary_new (const GNOME_Evolution_Shell shell)
{
ESummary *esummary;
ESummaryPrivate *priv;
@@ -546,7 +546,7 @@ e_summary_view_from_id (ESummary *esummary,
void
e_summary_set_shell_view_interface (ESummary *summary,
- Evolution_ShellView svi)
+ GNOME_Evolution_ShellView svi)
{
ESummaryPrivate *priv;
@@ -558,14 +558,14 @@ e_summary_set_shell_view_interface (ESummary *summary,
priv->shell_view_interface = svi;
}
-/* Wrappers for Evolution_ShellView */
+/* Wrappers for GNOME_Evolution_ShellView */
void
e_summary_set_message (ESummary *esummary,
const char *message,
gboolean busy)
{
ESummaryPrivate *priv;
- Evolution_ShellView svi;
+ GNOME_Evolution_ShellView svi;
CORBA_Environment ev;
g_return_if_fail (esummary != NULL);
@@ -579,9 +579,9 @@ e_summary_set_message (ESummary *esummary,
CORBA_exception_init (&ev);
if (message != NULL)
- Evolution_ShellView_set_message (svi, message, busy, &ev);
+ GNOME_Evolution_ShellView_setMessage (svi, message, busy, &ev);
else
- Evolution_ShellView_set_message (svi, "", busy, &ev);
+ GNOME_Evolution_ShellView_setMessage (svi, "", busy, &ev);
CORBA_exception_free (&ev);
}
@@ -589,7 +589,7 @@ void
e_summary_unset_message (ESummary *esummary)
{
ESummaryPrivate *priv;
- Evolution_ShellView svi;
+ GNOME_Evolution_ShellView svi;
CORBA_Environment ev;
g_return_if_fail (esummary != NULL);
@@ -602,7 +602,7 @@ e_summary_unset_message (ESummary *esummary)
return;
CORBA_exception_init (&ev);
- Evolution_ShellView_unset_message (svi, &ev);
+ GNOME_Evolution_ShellView_unsetMessage (svi, &ev);
CORBA_exception_free (&ev);
}
@@ -611,7 +611,7 @@ e_summary_change_current_view (ESummary *esummary,
const char *uri)
{
ESummaryPrivate *priv;
- Evolution_ShellView svi;
+ GNOME_Evolution_ShellView svi;
CORBA_Environment ev;
g_return_if_fail (esummary != NULL);
@@ -624,7 +624,7 @@ e_summary_change_current_view (ESummary *esummary,
return;
CORBA_exception_init (&ev);
- Evolution_ShellView_change_current_view (svi, uri, &ev);
+ GNOME_Evolution_ShellView_changeCurrentView (svi, uri, &ev);
CORBA_exception_free (&ev);
}
@@ -633,7 +633,7 @@ e_summary_set_title (ESummary *esummary,
const char *title)
{
ESummaryPrivate *priv;
- Evolution_ShellView svi;
+ GNOME_Evolution_ShellView svi;
CORBA_Environment ev;
g_return_if_fail (esummary != NULL);
@@ -646,7 +646,7 @@ e_summary_set_title (ESummary *esummary,
return;
CORBA_exception_init (&ev);
- Evolution_ShellView_set_title (svi, title, &ev);
+ GNOME_Evolution_ShellView_setTitle (svi, title, &ev);
CORBA_exception_free (&ev);
}
diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h
index f68575d76c..2e930cd692 100644
--- a/executive-summary/component/e-summary.h
+++ b/executive-summary/component/e-summary.h
@@ -61,7 +61,7 @@ struct _ESummaryClass {
};
GtkType e_summary_get_type (void);
-GtkWidget *e_summary_new (const Evolution_Shell shell);
+GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell);
int e_summary_rebuild_page (ESummary *esummary);
void e_summary_add_html_service (ESummary *esummary,
ExecutiveSummary *summary,
@@ -89,7 +89,7 @@ void e_summary_add_service (ESummary *esummary,
ExecutiveSummaryComponentView * e_summary_view_from_id (ESummary *esummary,
int id);
void e_summary_set_shell_view_interface (ESummary *summary,
- Evolution_ShellView svi);
+ GNOME_Evolution_ShellView svi);
void e_summary_set_message (ESummary *esummary,
const char *message,
gboolean busy);
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
diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl
index 76f98dd537..04b89187e0 100644
--- a/executive-summary/idl/Summary.idl
+++ b/executive-summary/idl/Summary.idl
@@ -10,24 +10,26 @@
#include <Bonobo.idl>
+module GNOME {
module Evolution {
- interface Summary: Bonobo::Unknown {
+module Summary {
+ interface ViewFrame: Bonobo::Unknown {
exception NoSubWindow {};
/**
- * set_title:
+ * setTitle:
* @component: The SummaryComponent whose window to set the title.
* @title: The title.
*
* Sets the title of the subwindow that displays @component
* to @title
*/
- void set_title (in long id,
- in string title)
+ void setTitle (in long id,
+ in string title)
raises (NoSubWindow);
- void set_icon (in long id,
- in string icon)
+ void setIcon (in long id,
+ in string icon)
raises (NoSubWindow);
/**
@@ -40,15 +42,17 @@ module Evolution {
raises (NoSubWindow);
/**
- * update_html_component:
+ * updateComponent:
* @component: The SummaryComponent that owns a subwindow.
* @html: The new html that defines a component.
*
* Requests that the html that displays @component is changed
* to @html.
*/
- void update_component (in long id,
- in string html)
+ void updateComponent (in long id,
+ in string html)
raises (NoSubWindow);
};
};
+};
+};
diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl
index 1c60314fb2..fbfd58800a 100644
--- a/executive-summary/idl/SummaryComponent.idl
+++ b/executive-summary/idl/SummaryComponent.idl
@@ -12,28 +12,30 @@
#include <Bonobo.idl>
+module GNOME {
module Evolution {
- interface Summary;
+module Summary {
+ interface ViewFrame;
- interface SummaryComponent: Bonobo::Unknown {
+ interface Component: Bonobo::Unknown {
/**
- * set_owner:
+ * setOwner:
* @summary: A Summary object.
*
* Sets the owner of the component.
*/
- void set_owner (in Summary owner);
+ void setOwner (in ViewFrame owner);
/**
- * unset_owner:
+ * unsetOwner:
*
* Unsets the owner of the component.
*/
- void unset_owner ();
+ void unsetOwner ();
/**
- * create_view:
+ * createView:
* @control: A Bonobo_Control
* @html: HTML of the view.
* @title: Title of the view.
@@ -42,19 +44,19 @@ module Evolution {
* Creates a summary of the data that the component has.
* Returns: The ID of the view.
*/
- long create_view (in long id,
- out Bonobo::Control control,
- out string html,
- out string title,
- out string icon);
+ long createView (in long id,
+ out Bonobo::Control control,
+ out string html,
+ out string title,
+ out string icon);
/**
- * destroy_view:
+ * destroyView:
* @id: ID of the view to be destroyed.
*
* Tells a service that a view has been destroyed.
*/
- void destroy_view (in long id);
+ void destroyView (in long id);
/**
* configure:
@@ -65,3 +67,5 @@ module Evolution {
};
};
+};
+};