diff options
-rw-r--r-- | mail/ChangeLog | 8 | ||||
-rw-r--r-- | mail/Evolution-Mail.idl | 9 | ||||
-rw-r--r-- | mail/mail-component.c | 10 |
3 files changed, 25 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 834a4d5b62..143b8f88ec 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,13 @@ 2005-06-02 Not Zed <NotZed@Ximian.com> + * Evolution-Mail.idl: only let this be included once. + + * mail-component.c (mail_component_class_init): Setup a test + function, and fix the bonobo init function so we're actually a + mailcomponent and not just an evolutioncomponent. + +2005-06-02 Not Zed <NotZed@Ximian.com> + * mail-component.c: change this to sub-class evolution-component, not bonobo-object. diff --git a/mail/Evolution-Mail.idl b/mail/Evolution-Mail.idl index 82097a9c1e..52afa167de 100644 --- a/mail/Evolution-Mail.idl +++ b/mail/Evolution-Mail.idl @@ -1,9 +1,18 @@ + +#ifndef _GNOME_EVOLUTION_MAILCOMPONENT_IDL +#define _GNOME_EVOLUTION_MAILCOMPONENT_IDL + + #include <shell/Evolution-Component.idl> module GNOME { module Evolution { interface MailComponent : Component { // Insert wonderous remote mail operations here. + + void test(); }; }; }; + +#endif diff --git a/mail/mail-component.c b/mail/mail-component.c index 3e11a8e249..e6d77bba9d 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -860,6 +860,12 @@ impl_upgradeFromVersion (PortableServer_Servant servant, const short major, cons camel_exception_clear (&ex); } +static void +impl_mail_test(PortableServer_Servant servant, CORBA_Environment *ev) +{ + printf("*** Testing mail interface!! ***\n"); +} + /* Initialization. */ static void @@ -883,7 +889,7 @@ mail_component_class_init (MailComponentClass *class) epv->sendAndReceive = impl_sendAndReceive; epv->upgradeFromVersion = impl_upgradeFromVersion; - mepv = mepv; + mepv->test = impl_mail_test; } static void @@ -1175,4 +1181,4 @@ mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t i return mc_default_folders[id].uri; } -BONOBO_TYPE_FUNC_FULL (MailComponent, GNOME_Evolution_Component, PARENT_TYPE, mail_component) +BONOBO_TYPE_FUNC_FULL (MailComponent, GNOME_Evolution_MailComponent, PARENT_TYPE, mail_component) |