aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/gui/component/Makefile.am3
-rw-r--r--addressbook/gui/component/component-factory.c4
-rw-r--r--addressbook/gui/contact-list-editor/Makefile.am12
4 files changed, 13 insertions, 18 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 3b8ac134c4..033425bee6 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2004-12-23 Hans Petter Jansson <hpj@novell.com>
+
+ * gui/component/Makefile.am (SUBDIRS): No more select-names.
+ (libevolution_addressbook_la_LIBADD): Remove libeselectnames.la.
+
+ * gui/component/component-factory.c (factory): Remove the select-names
+ component.
+
+ * gui/contact-list-editor/Makefile.am (IDL)
+ (IDL_GENERATED_H)
+ (selectnamesdir): No longer needed, so removed.
+
2004-12-22 Hans Petter Jansson <hpj@novell.com>
* gui/contact-list-editor/e-contact-list-editor.c
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index c8c2cc79a3..887112c6ff 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = select-names
-
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
-I$(top_srcdir) \
@@ -48,7 +46,6 @@ endif
libevolution_addressbook_la_LIBADD = \
$(SMIME_LIB) \
$(top_builddir)/addressbook/printing/libecontactprint.la \
- $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
index 382722785e..4aaee9637b 100644
--- a/addressbook/gui/component/component-factory.c
+++ b/addressbook/gui/component/component-factory.c
@@ -30,7 +30,6 @@
#include "autocompletion-config.h"
#include "eab-popup-control.h"
#include "eab-vcard-control.h"
-#include "select-names/e-select-names-bonobo.h"
#ifdef ENABLE_SMIME
#include "smime/gui/certificate-manager.h"
#endif
@@ -42,7 +41,6 @@
#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION
#define COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_Component:" BASE_VERSION
#define ADDRESS_POPUP_ID "OAFIID:GNOME_Evolution_Addressbook_AddressPopup:" BASE_VERSION
-#define SELECT_NAMES_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION
#define COMPLETION_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:" BASE_VERSION
#define CERTIFICATE_MANAGER_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl:" BASE_VERSION
@@ -67,8 +65,6 @@ factory (BonoboGenericFactory *factory,
return BONOBO_OBJECT (eab_popup_control_new ());
if (strcmp (component_id, COMPLETION_CONFIG_CONTROL_ID) == 0)
return BONOBO_OBJECT (autocompletion_config_control_new ());
- if (strcmp (component_id, SELECT_NAMES_ID) == 0)
- return BONOBO_OBJECT (e_select_names_bonobo_new ());
#ifdef ENABLE_SMIME
if (strcmp (component_id, CERTIFICATE_MANAGER_CONFIG_CONTROL_ID) == 0)
return BONOBO_OBJECT (certificate_manager_config_control_new ());
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 5df78b3eac..43abc3ff47 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -1,13 +1,3 @@
-IDL = Evolution-Addressbook-SelectNames.idl
-
-IDL_GENERATED_H = \
- Evolution-Addressbook-SelectNames.h
-
-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
-
-$(IDL_GENERATED_H): $(selectnamesdir)/$(IDL)
- $(ORBIT_IDL) --nostubs --noskels --nocommon $(IDL_INCLUDES) $(selectnamesdir)/$(IDL)
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/ \
@@ -41,7 +31,7 @@ MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marsha
glade_DATA = contact-list-editor.glade
etspec_DATA = e-contact-list-editor.etspec
-BUILT_SOURCES = $(MARSHAL_GENERATED) $(IDL_GENERATED_H)
+BUILT_SOURCES = $(MARSHAL_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(glade_DATA) \