diff options
Diffstat (limited to 'executive-summary/component')
-rw-r--r-- | executive-summary/component/Makefile.am | 4 | ||||
-rw-r--r-- | executive-summary/component/component-factory.c | 4 | ||||
-rw-r--r-- | executive-summary/component/e-summary-factory.c | 4 | ||||
-rw-r--r-- | executive-summary/component/e-summary-factory.h | 2 | ||||
-rw-r--r-- | executive-summary/component/e-summary-url.c | 20 | ||||
-rw-r--r-- | executive-summary/component/e-summary.c | 28 | ||||
-rw-r--r-- | executive-summary/component/e-summary.h | 4 |
7 files changed, 33 insertions, 33 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); |