aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-09-13 23:05:44 +0800
committerDan Winship <danw@src.gnome.org>2002-09-13 23:05:44 +0800
commite2e4b1120cecd53623265d6850ed4693d72233ba (patch)
tree38c331a50b0402afaf614f5c5bf039eede1a8cc2 /mail
parentdbe5c76eb0241a143c365f0f2731830e04fe1cc7 (diff)
downloadgsoc2013-evolution-e2e4b1120cecd53623265d6850ed4693d72233ba.tar
gsoc2013-evolution-e2e4b1120cecd53623265d6850ed4693d72233ba.tar.gz
gsoc2013-evolution-e2e4b1120cecd53623265d6850ed4693d72233ba.tar.bz2
gsoc2013-evolution-e2e4b1120cecd53623265d6850ed4693d72233ba.tar.lz
gsoc2013-evolution-e2e4b1120cecd53623265d6850ed4693d72233ba.tar.xz
gsoc2013-evolution-e2e4b1120cecd53623265d6850ed4693d72233ba.tar.zst
gsoc2013-evolution-e2e4b1120cecd53623265d6850ed4693d72233ba.zip
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
Diffstat (limited to 'mail')
-rw-r--r--mail/.cvsignore8
-rw-r--r--mail/ChangeLog15
-rw-r--r--mail/Mailer.idl (renamed from mail/Mail.idl)17
-rw-r--r--mail/Makefile.am14
-rw-r--r--mail/folder-info.c2
-rw-r--r--mail/mail-config.c15
-rw-r--r--mail/message-list.c1
7 files changed, 42 insertions, 30 deletions
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 <danw@ximian.com>
+
+ * 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 <fejj@ximian.com>
* main.c (main): Ignore SIGXFSZ to fix bug #30269.
diff --git a/mail/Mail.idl b/mail/Mailer.idl
index 01f4bb2dfb..353d2bae46 100644
--- a/mail/Mail.idl
+++ b/mail/Mailer.idl
@@ -12,22 +12,6 @@
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;
@@ -69,6 +53,7 @@ module Evolution {
};
void addAccount (in Account acc);
+ void removeAccount (in string name);
};
interface MailFilter : Bonobo::Unknown {
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 <glib.h>
#include <libgnome/gnome-defs.h>
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] = {
@@ -2836,12 +2836,25 @@ impl_GNOME_Evolution_MailConfig_addAccount (PortableServer_Servant servant,
}
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)
{
POA_GNOME_Evolution_MailConfig__epv *epv = &klass->epv;
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"