From c4dfc8669bf21acf8c06cc7f79d0864c8e3d4fab Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Sat, 30 Dec 2000 05:25:57 +0000 Subject: new function, calling our new config ui code. (control_activate): no 2000-12-29 Chris Toshok * gui/component/addressbook.c (config_cb): new function, calling our new config ui code. (control_activate): no longer load evolution-addressbook-ldap.xml, as it's not there. * gui/component/addressbook-component.c (owner_set_cb): setup_ldap_storage => addressbook_storage_setup. * gui/component/Makefile.am (evolution_addressbook_SOURCES): remove e-ldap-storage.[ch] and add addressbook-storage.[ch]. (glade_DATA): remove ldap-server-dialog.glade and add addressbook-config.glade. (EXTRA_DIST): same. * gui/component/addressbook-config.[ch]: add another dialog to give a list of our sources and offer the Add/Delete/Edit interface. This plugs into the previous dialog work (the source editor.) * gui/component/addressbook-storage.[ch]: new files, containing the remains of e-ldap-storage.[ch] and adding the new AddressbookSource type and it's subordinates. Also, the xml format has changed slightly and the file name is no longer ~/evolution/ldap-servers.xml - it's ~/evolution/addressbook-sources.xml. * gui/component/addressbook-config.glade: new file, new config interface. * gui/component/ldap-server-dialog.glade: removed. * gui/component/e-ldap-storage.[ch]: removed. svn path=/trunk/; revision=7198 --- addressbook/gui/component/Makefile.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'addressbook/gui/component/Makefile.am') diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 4b13a297f2..b4f5bd1a09 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -31,14 +31,12 @@ evolution_addressbook_SOURCES = \ addressbook-config.c \ addressbook-config.h \ addressbook-factory.c \ + addressbook-storage.c \ + addressbook-storage.h \ addressbook.c \ addressbook.h \ e-cardlist-model.c \ - e-cardlist-model.h \ - e-ldap-server-dialog.c \ - e-ldap-server-dialog.h \ - e-ldap-storage.c \ - e-ldap-storage.h + e-cardlist-model.h evolution_addressbook_LDADD = \ select-names/libeselectnames.la \ @@ -63,12 +61,12 @@ oafdir = $(datadir)/oaf oaf_DATA = GNOME_Evolution_Addressbook.oafinfo gladedir = $(datadir)/evolution/glade -glade_DATA = ldap-server-dialog.glade +glade_DATA = addressbook-config.glade EXTRA_DIST = \ $(glade_DATA) \ $(oaf_DATA) \ - ldap-server-dialog.glade.h + addressbook-config.glade if ENABLE_PURIFY PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -- cgit v1.2.3