aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/Makefile.am8
-rw-r--r--addressbook/gui/component/addressbook.gnorba23
3 files changed, 7 insertions, 30 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d4118bf4b7..27a84b3437 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-26 JP Rosevear <jpr@helixcode.com>
+
+ * gui/component/addressbook.gnorba: Kill
+
+ * gui/component/Makefile.am: Remove gnorba stuff
+
2000-08-25 Dan Winship <danw@helixcode.com>
* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 19441860f2..d531c420ac 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -63,21 +63,15 @@ evolution_addressbook_LDADD = \
evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
-if USING_OAF
oafdir = $(datadir)/oaf
oaf_DATA = addressbook.oafinfo
-else
-gnorbadir = $(sysconfdir)/CORBA/servers
-gnorba_DATA = addressbook.gnorba
-endif
gladedir = $(datadir)/evolution/glade
glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade
EXTRA_DIST = \
$(glade_DATA) \
- addressbook.gnorba \
- addressbook.oafinfo \
+ $(oaf_DATA) \
alphabet.glade.h
if ENABLE_PURIFY
diff --git a/addressbook/gui/component/addressbook.gnorba b/addressbook/gui/component/addressbook.gnorba
deleted file mode 100644
index bc3830686d..0000000000
--- a/addressbook/gui/component/addressbook.gnorba
+++ /dev/null
@@ -1,23 +0,0 @@
-[control-factory:addressbook]
-type=exe
-repo_id=IDL:GNOME/GenericFactory:1.0
-description=Factory for the sample Addressbook control
-location_info=evolution-addressbook
-
-[control:addressbook]
-type=factory
-repo_id=IDL:BonoboControl/addressbook-control:1.0 IDL:GNOME/Control:1.0
-description=A sample Bonobo control which displays an addressbook.
-location_info=control-factory:addressbook
-
-[evolution-shell-component-factory:addressbook]
-type=exe
-repo_id=IDL:GNOME/GenericFactory:1.0
-description=Factory for the Evolution addressbook component.
-location_info=evolution-addressbook
-
-[evolution-shell-component:addressbook]
-type=factory
-repo_id=IDL:Evolution/ShellComponent:1.0
-description=Evolution component for handling contacts.
-location_info=evolution-shell-component-factory:addressbook