From 5b5666d4cfc51a02f97df49dbd178b7b6ad0621c Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@helixcode.com>
Date: Sat, 26 Aug 2000 05:52:05 +0000
Subject: Kill

2000-08-26  JP Rosevear  <jpr@helixcode.com>

	* evolution-mail.gnorba: Kill

	* Makefile.am: Remove gnorba related stuff

svn path=/trunk/; revision=5049
---
 mail/ChangeLog             |  6 ++++++
 mail/Makefile.am           | 12 ++----------
 mail/evolution-mail.gnorba | 23 -----------------------
 3 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 mail/evolution-mail.gnorba

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e3b84523ea..4d9118c63d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-26  JP Rosevear  <jpr@helixcode.com>
+
+	* evolution-mail.gnorba: Kill
+
+	* Makefile.am: Remove gnorba related stuff
+
 2000-08-25  Peter Williams  <peterw@helixcode.com>
 
 	* mail-config-gui.c (service_page_item_new): If the service wants
diff --git a/mail/Makefile.am b/mail/Makefile.am
index cf13d00c54..ab80b0589c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -112,16 +112,8 @@ test_mail_LDADD = \
 #
 #test_thread_CFLAGS = -g $(THREADS_CFLAGS)
 
-GOAD_FILES = evolution-mail.gnorba
-OAF_FILES = evolution-mail.oafinfo
-
-if USING_OAF
 oafdir = $(datadir)/oaf
-oaf_DATA = $(OAF_FILES)
-else
-gnorbadir = $(sysconfdir)/CORBA/servers
-gnorba_DATA = $(GOAD_FILES)
-endif
+oaf_DATA = evolution-mail.oafinfo
 
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = mail-config.glade mail-config-druid.glade local-config.glade
@@ -131,7 +123,7 @@ iconsdir = $(datadir)/images/evolution
 $(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl 
 	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --cflags idl` -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Mail.idl
 
-EXTRA_DIST = Mail.idl $(glade_DATA) $(GOAD_FILES) $(OAF_FILES)
+EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/mail/evolution-mail.gnorba b/mail/evolution-mail.gnorba
deleted file mode 100644
index b799a57aa2..0000000000
--- a/mail/evolution-mail.gnorba
+++ /dev/null
@@ -1,23 +0,0 @@
-[control-factory:evolution-mail]
-type=exe
-repo_id=IDL:GNOME/GenericFactory:1.0
-description=Evolution mail folder factory component.
-location_info=evolution-mail
-
-[control:evolution-mail]
-type=factory
-repo_id=IDL:BonoboControl/evolution-mail:1.0 IDL:GNOME/Control:1.0
-description=Evolution mail folder display component.
-location_info=control-factory:evolution-mail
-
-[evolution-shell-component-factory:evolution-mail]
-type=exe
-repo_id=IDL:GNOME/GenericFactory:1.0
-description=Factory for the Evolution mail component.
-location_info=evolution-mail
-
-[evolution-shell-component:evolution-mail]
-type=factory
-repo_id=IDL:Evolution/ShellComponent:1.0
-description=Evolution component for handling mail.
-location_info=evolution-shell-component-factory:evolution-mail
-- 
cgit