From e2e4b1120cecd53623265d6850ed4693d72233ba Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 13 Sep 2002 15:05:44 +0000 Subject: rename this from "Mail.idl" so that the generated .h file won't overwrite * Mailer.idl: rename this from "Mail.idl" so that the generated .h file won't overwrite "mail.h" on Mac OS X. Remove some never-implemented IDL and add MailConfig_removeAccount. * Makefile.am: Update for IDL rename * mail-config.c: #include Mailer.h, not Mail.h (impl_GNOME_Evolution_MailConfig_removeAccount): Implement. * folder-info.c: #include Mailer.h, not Mail.h * message-list.c: Remove Mail.h include. svn path=/trunk/; revision=18060 --- mail/.cvsignore | 8 +++--- mail/ChangeLog | 15 ++++++++++ mail/Mail.idl | 82 ----------------------------------------------------- mail/Mailer.idl | 67 +++++++++++++++++++++++++++++++++++++++++++ mail/Makefile.am | 14 ++++----- mail/folder-info.c | 2 +- mail/mail-config.c | 15 +++++++++- mail/message-list.c | 1 - 8 files changed, 108 insertions(+), 96 deletions(-) delete mode 100644 mail/Mail.idl create mode 100644 mail/Mailer.idl (limited to 'mail') diff --git a/mail/.cvsignore b/mail/.cvsignore index 09cabea825..d01d1312c8 100644 --- a/mail/.cvsignore +++ b/mail/.cvsignore @@ -3,10 +3,10 @@ .pure Makefile Makefile.in -Mail-stubs.c -Mail-skels.c -Mail-common.c -Mail.h +Mailer-stubs.c +Mailer-skels.c +Mailer-common.c +Mailer.h evolution-mail evolution-mail.pure test-mail diff --git a/mail/ChangeLog b/mail/ChangeLog index 257af848b5..ddf4198fac 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,18 @@ +2002-09-13 Dan Winship + + * Mailer.idl: rename this from "Mail.idl" so that the generated .h + file won't overwrite "mail.h" on Mac OS X. Remove some + never-implemented IDL and add MailConfig_removeAccount. + + * Makefile.am: Update for IDL rename + + * mail-config.c: #include Mailer.h, not Mail.h + (impl_GNOME_Evolution_MailConfig_removeAccount): Implement. + + * folder-info.c: #include Mailer.h, not Mail.h + + * message-list.c: Remove Mail.h include. + 2002-09-12 Jeffrey Stedfast * main.c (main): Ignore SIGXFSZ to fix bug #30269. diff --git a/mail/Mail.idl b/mail/Mail.idl deleted file mode 100644 index 01f4bb2dfb..0000000000 --- a/mail/Mail.idl +++ /dev/null @@ -1,82 +0,0 @@ -/* - * mail.idl: Mail interfaces for Evolution - * - * Author: - * Miguel de Icaza (miguel@ximian.com) - * - * (C) 2000 Ximian, Inc. - */ - -#include - -module GNOME { -module Evolution { - - interface MessageList : Bonobo::Unknown { - - void selectMessage (in long message_number); - void openMessage (in long message_number); - }; - - /* - * FolderBrowser object. - * - * configuration of this widget is done trough - * Bonobo Properties - */ - interface FolderBrowser : Bonobo::Unknown { - MessageList getMessageList (); - }; - - interface FolderInfo : Bonobo::Unknown { - struct MessageCount { - string path; - long count; - long unread; - }; - - void getInfo (in string foldername, - in Bonobo::Listener listener); - }; - - interface MailConfig : Bonobo::Unknown { - - struct Identity { - string name; - string address; - string reply_to; - string organization; - }; - - struct Service { - string url; - boolean keep_on_server; - boolean auto_check; - long auto_check_time; - boolean save_passwd; - boolean enabled; - }; - - struct Account { - string name; - - Identity id; - Service source; - Service transport; - - string drafts_folder_uri; - string sent_folder_uri; - }; - - void addAccount (in Account acc); - }; - - interface MailFilter : Bonobo::Unknown { - - void addFilter (in string rule); - - void removeFilter (in string rule); - }; -}; -}; - diff --git a/mail/Mailer.idl b/mail/Mailer.idl new file mode 100644 index 0000000000..353d2bae46 --- /dev/null +++ b/mail/Mailer.idl @@ -0,0 +1,67 @@ +/* + * mail.idl: Mail interfaces for Evolution + * + * Author: + * Miguel de Icaza (miguel@ximian.com) + * + * (C) 2000 Ximian, Inc. + */ + +#include + +module GNOME { +module Evolution { + + interface FolderInfo : Bonobo::Unknown { + struct MessageCount { + string path; + long count; + long unread; + }; + + void getInfo (in string foldername, + in Bonobo::Listener listener); + }; + + interface MailConfig : Bonobo::Unknown { + + struct Identity { + string name; + string address; + string reply_to; + string organization; + }; + + struct Service { + string url; + boolean keep_on_server; + boolean auto_check; + long auto_check_time; + boolean save_passwd; + boolean enabled; + }; + + struct Account { + string name; + + Identity id; + Service source; + Service transport; + + string drafts_folder_uri; + string sent_folder_uri; + }; + + void addAccount (in Account acc); + void removeAccount (in string name); + }; + + interface MailFilter : Bonobo::Unknown { + + void addFilter (in string rule); + + void removeFilter (in string rule); + }; +}; +}; + diff --git a/mail/Makefile.am b/mail/Makefile.am index c72d845695..e67b7b9b9e 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -33,10 +33,10 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-mail\" EVOLUTION_MAIL_CORBA_GENERATED = \ - Mail.h \ - Mail-common.c \ - Mail-skels.c \ - Mail-stubs.c + Mailer.h \ + Mailer-common.c \ + Mailer-skels.c \ + Mailer-stubs.c SPELL_IDL = Spell.idl @@ -176,12 +176,12 @@ etspec_DATA = mail-accounts.etspec message-list.etspec subscribe-dialog.etspec iconsdir = $(datadir)/images/evolution buttonsdir = $(datadir)/images/evolution/buttons -$(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl +$(EVOLUTION_MAIL_CORBA_GENERATED): Mailer.idl $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \ - -I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mail.idl + -I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mailer.idl EXTRA_DIST = \ - Mail.idl \ + Mailer.idl \ $(SPELL_IDL) \ $(glade_DATA) \ $(oaf_in_files) \ diff --git a/mail/folder-info.c b/mail/folder-info.c index 3b447b47a3..e9db9a22fc 100644 --- a/mail/folder-info.c +++ b/mail/folder-info.c @@ -12,7 +12,7 @@ #include "folder-info.h" -#include "Mail.h" +#include "Mailer.h" #include #include diff --git a/mail/mail-config.c b/mail/mail-config.c index 46c063305a..bfe5608925 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -69,7 +69,7 @@ #include "mail-mt.h" #include "mail-tools.h" -#include "Mail.h" +#include "Mailer.h" MailConfigLabel label_defaults[5] = { @@ -2835,6 +2835,18 @@ impl_GNOME_Evolution_MailConfig_addAccount (PortableServer_Servant servant, mail_config_add_account (mail_account); } +static void +impl_GNOME_Evolution_MailConfig_removeAccount (PortableServer_Servant servant, + const CORBA_char *name, + CORBA_Environment *ev) +{ + MailConfigAccount *account; + + account = (MailConfigAccount *)mail_config_get_account_by_name (name); + if (account) + mail_config_remove_account (account); +} + static void evolution_mail_config_class_init (EvolutionMailConfigClass *klass) { @@ -2842,6 +2854,7 @@ evolution_mail_config_class_init (EvolutionMailConfigClass *klass) parent_class = gtk_type_class (PARENT_TYPE); epv->addAccount = impl_GNOME_Evolution_MailConfig_addAccount; + epv->removeAccount = impl_GNOME_Evolution_MailConfig_removeAccount; } static void diff --git a/mail/message-list.c b/mail/message-list.c index f19b0cc5dd..b6c73c6e17 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -56,7 +56,6 @@ #include "mail-mt.h" #include "mail-tools.h" #include "mail-ops.h" -#include "Mail.h" #include "art/mail-new.xpm" #include "art/mail-read.xpm" -- cgit v1.2.3