diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/Evolution-Composer.idl | 28 | ||||
| -rw-r--r-- | composer/Makefile.am | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 10 | ||||
| -rw-r--r-- | composer/evolution-composer.c | 42 | ||||
| -rw-r--r-- | composer/evolution-composer.h | 4 |
6 files changed, 51 insertions, 44 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 42d0c9e0ed..a9b3305f3f 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2000-11-10 Michael Meeks <michael@helixcode.com> + + * Makefile.am ($(HTML_EDITOR_GENERATED)): rearrnace + includes. + 2000-11-10 Larry Ewing <lewing@helixcode.com> * e-msg-composer.c (build_message): set the HTML charset to utf-8 diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl index 1e3701a594..3fcda3873e 100644 --- a/composer/Evolution-Composer.idl +++ b/composer/Evolution-Composer.idl @@ -10,6 +10,7 @@ #include <Bonobo.idl> +module GNOME { module Evolution { interface Composer : Bonobo::Unknown { @@ -20,7 +21,7 @@ module Evolution { typedef sequence<Recipient> RecipientList; /** - * set_headers: + * setHeaders: * @to: the "To" recipients * @cc: the "CC" recipients * @bcc: the "Bcc" recipients @@ -30,31 +31,31 @@ module Evolution { * @bcc may be an empty list, and @subject may be an * empty string. **/ - void set_headers (in RecipientList to, in RecipientList cc, - in RecipientList bcc, in string subject); + void setHeaders (in RecipientList to, in RecipientList cc, + in RecipientList bcc, in string subject); /** - * set_body_text: + * setBodyText: * @body: the body * * Sets the text in the body of the composer to * the given UTF-8 plain text. **/ - void set_body_text (in string body); + void setBodyText (in string body); /** - * attach_MIME: + * attachMIME: * @data: the attachment data * * This adds an attachment to the composer. @data * should be a fully-formed MIME body part. **/ exception CouldNotParse {}; - void attach_MIME (in string data) + void attachMIME (in string data) raises (CouldNotParse); /** - * attach_data: + * attachData: * @content_type: the Content-Type header * @filename: the suggested filename, or "" * @description: a description of the data, or "" @@ -76,11 +77,11 @@ module Evolution { * all of the MIME headers yourself and use * add_attachment (). **/ - void attach_data (in string content_type, - in string filename, - in string description, - in boolean show_inline, - in string data); + void attachData (in string content_type, + in string filename, + in string description, + in boolean show_inline, + in string data); /** @@ -92,3 +93,4 @@ module Evolution { void show (); }; }; +}; diff --git a/composer/Makefile.am b/composer/Makefile.am index 144c3f85a8..d281725a83 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -19,11 +19,11 @@ HTML_EDITOR_GENERATED = \ selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names $(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl - $(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ - -I $(selectnamesdir) -I . $(srcdir)/Composer.idl + $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ + -I $(selectnamesdir) $(srcdir)/Composer.idl $(HTML_EDITOR_GENERATED): $(GTK_HTML_EDITOR_IDL) - $(ORBIT_IDL) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL) + $(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL) ## diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index a73d69c733..1cd999c11f 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -44,7 +44,7 @@ #define SELECT_NAMES_OAFID "OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61" struct _EMsgComposerHdrsPrivate { - Evolution_Addressbook_SelectNames corba_select_names; + GNOME_Evolution_Addressbook_SelectNames corba_select_names; /* Total number of headers that we have. */ guint num_hdrs; @@ -119,7 +119,7 @@ address_button_clicked_cb (GtkButton *button, CORBA_exception_init (&ev); /* FIXME: Section ID */ - Evolution_Addressbook_SelectNames_activate_dialog (priv->corba_select_names, "", &ev); + GNOME_Evolution_Addressbook_SelectNames_activateDialog (priv->corba_select_names, "", &ev); CORBA_exception_free (&ev); } @@ -183,7 +183,7 @@ create_addressbook_entry (EMsgComposerHdrs *hdrs, const char *name) { EMsgComposerHdrsPrivate *priv; - Evolution_Addressbook_SelectNames corba_select_names; + GNOME_Evolution_Addressbook_SelectNames corba_select_names; Bonobo_Control corba_control; GtkWidget *control_widget; CORBA_Environment ev; @@ -193,13 +193,13 @@ create_addressbook_entry (EMsgComposerHdrs *hdrs, CORBA_exception_init (&ev); - Evolution_Addressbook_SelectNames_add_section (corba_select_names, name, name, &ev); + GNOME_Evolution_Addressbook_SelectNames_addSection (corba_select_names, name, name, &ev); if (ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); return NULL; } - corba_control = Evolution_Addressbook_SelectNames_get_entry_for_section (corba_select_names, name, &ev); + corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (corba_select_names, name, &ev); if (ev._major != CORBA_NO_EXCEPTION) { CORBA_exception_free (&ev); diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c index f39482336c..c0e86ca227 100644 --- a/composer/evolution-composer.c +++ b/composer/evolution-composer.c @@ -38,12 +38,12 @@ static void (*postpone_cb) (EMsgComposer *, gpointer); /* CORBA interface implementation. */ -static POA_Evolution_Composer__vepv Composer_vepv; +static POA_GNOME_Evolution_Composer__vepv Composer_vepv; static GList * -corba_recipientlist_to_glist (const Evolution_Composer_RecipientList *cl) +corba_recipientlist_to_glist (const GNOME_Evolution_Composer_RecipientList *cl) { - Evolution_Composer_Recipient *recip; + GNOME_Evolution_Composer_Recipient *recip; GList *gl = NULL; char *str; int i; @@ -79,9 +79,9 @@ free_recipient_glist (GList *gl) static void impl_Composer_set_headers (PortableServer_Servant servant, - const Evolution_Composer_RecipientList *to, - const Evolution_Composer_RecipientList *cc, - const Evolution_Composer_RecipientList *bcc, + const GNOME_Evolution_Composer_RecipientList *to, + const GNOME_Evolution_Composer_RecipientList *cc, + const GNOME_Evolution_Composer_RecipientList *bcc, const CORBA_char *subject, CORBA_Environment *ev) { @@ -140,7 +140,7 @@ impl_Composer_attach_MIME (PortableServer_Servant servant, if (status == -1) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Evolution_Composer_CouldNotParse, + ex_GNOME_Evolution_Composer_CouldNotParse, NULL); return; } @@ -193,17 +193,17 @@ impl_Composer_show (PortableServer_Servant servant, gtk_widget_show (GTK_WIDGET (composer->composer)); } -POA_Evolution_Composer__epv * +POA_GNOME_Evolution_Composer__epv * evolution_composer_get_epv (void) { - POA_Evolution_Composer__epv *epv; + POA_GNOME_Evolution_Composer__epv *epv; - epv = g_new0 (POA_Evolution_Composer__epv, 1); - epv->set_headers = impl_Composer_set_headers; - epv->set_body_text = impl_Composer_set_body_text; - epv->attach_MIME = impl_Composer_attach_MIME; - epv->attach_data = impl_Composer_attach_data; - epv->show = impl_Composer_show; + epv = g_new0 (POA_GNOME_Evolution_Composer__epv, 1); + epv->setHeaders = impl_Composer_set_headers; + epv->setBodyText = impl_Composer_set_body_text; + epv->attachMIME = impl_Composer_attach_MIME; + epv->attachData = impl_Composer_attach_data; + epv->show = impl_Composer_show; return epv; } @@ -233,7 +233,7 @@ class_init (EvolutionComposerClass *klass) parent_class = gtk_type_class (bonobo_object_get_type ()); Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); - Composer_vepv.Evolution_Composer_epv = evolution_composer_get_epv (); + Composer_vepv.GNOME_Evolution_Composer_epv = evolution_composer_get_epv (); } static void @@ -249,7 +249,7 @@ init (EvolutionComposer *composer) void evolution_composer_construct (EvolutionComposer *composer, - Evolution_Composer corba_object) + GNOME_Evolution_Composer corba_object) { g_return_if_fail (composer != NULL); g_return_if_fail (EVOLUTION_IS_COMPOSER (composer)); @@ -262,15 +262,15 @@ EvolutionComposer * evolution_composer_new (void) { EvolutionComposer *new; - POA_Evolution_Composer *servant; + POA_GNOME_Evolution_Composer *servant; CORBA_Environment ev; - Evolution_Composer corba_object; + GNOME_Evolution_Composer corba_object; - servant = (POA_Evolution_Composer *) g_new0 (BonoboObjectServant, 1); + servant = (POA_GNOME_Evolution_Composer *) g_new0 (BonoboObjectServant, 1); servant->vepv = &Composer_vepv; CORBA_exception_init (&ev); - POA_Evolution_Composer__init ((PortableServer_Servant) servant, &ev); + POA_GNOME_Evolution_Composer__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_free (servant); CORBA_exception_free (&ev); diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h index 6f248dae22..65f3f246d2 100644 --- a/composer/evolution-composer.h +++ b/composer/evolution-composer.h @@ -53,11 +53,11 @@ struct _EvolutionComposerClass { BonoboObjectClass parent_class; }; -POA_Evolution_Composer__epv *evolution_composer_get_epv (void); +POA_GNOME_Evolution_Composer__epv *evolution_composer_get_epv (void); GtkType evolution_composer_get_type (void); void evolution_composer_construct (EvolutionComposer *, - Evolution_Composer); + GNOME_Evolution_Composer); EvolutionComposer *evolution_composer_new (void); void evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer), |