callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert 8 spaces to a tab.

Browse Source 
2003-10-23  Chris Toshok  <toshok@ximian.com>

	* tools/Makefile.am: convert 8 spaces to a tab.

	* tools/.cvsignore: ignore evolution-addressbook-abuse and
	evolution-addressbook-clean.

	* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
	add libevolution-smime.la.

	* gui/component/component-factory.c (factory): add the certificate
	manager config control stuff here, at least for now.

	* gui/component/GNOME_Evolution_Addressbook.server.in.in: same.

svn path=/trunk/; revision=23048
This commit is contained in:
Chris Toshok
2003-10-23 17:24:59 +00:00
committed by Chris Toshok
parent 71e7cc3890
commit 00829a7012
5 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
addressbook/ChangeLog
View File

@ -1,3 +1,18 @@
2003-10-23 Chris Toshok <toshok@ximian.com>
* tools/Makefile.am: convert 8 spaces to a tab.
* tools/.cvsignore: ignore evolution-addressbook-abuse and
evolution-addressbook-clean.
* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
add libevolution-smime.la.
* gui/component/component-factory.c (factory): add the certificate
manager config control stuff here, at least for now.
* gui/component/GNOME_Evolution_Addressbook.server.in.in: same.
2003-10-23 Rodrigo Moya <rodrigo@ximian.com>
* gui/component/addressbook-config.c

1
addressbook/gui/component/Makefile.am
View File

@ -42,6 +42,7 @@ libevolution_addressbook_la_SOURCES = \
# $(top_builddir)/addressbook/printing/libecontactprint.la
libevolution_addressbook_la_LIBADD = \
$(top_builddir)/smime/gui/libevolution-smime.la \
$(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \

4
addressbook/gui/component/component-factory.c
View File

@ -29,6 +29,7 @@
#include "eab-popup-control.h"
#include "eab-vcard-control.h"
#include "select-names/e-select-names-bonobo.h"
#include "smime/gui/certificate-manager.h"
#include <bonobo/bonobo-shlib-factory.h>
@ -41,6 +42,7 @@
#define ADDRESS_POPUP_ID "OAFIID:GNOME_Evolution_Addressbook_AddressPopup"
#define SELECT_NAMES_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"
#define LDAP_STORAGE_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl"
#define CERTIFICATE_MANAGER_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_SMime_CertificateManager_ConfigControl"
static BonoboObject *
@ -65,6 +67,8 @@ factory (BonoboGenericFactory *factory,
return BONOBO_OBJECT (addressbook_config_control_new ());
if (strcmp (component_id, SELECT_NAMES_ID) == 0)
return BONOBO_OBJECT (e_select_names_bonobo_new ());
if (strcmp (component_id, CERTIFICATE_MANAGER_CONFIG_CONTROL_ID) == 0)
return BONOBO_OBJECT (certificate_manager_config_control_new ());
g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
return NULL;

2
addressbook/tools/.cvsignore
View File

@ -1,3 +1,5 @@
Makefile
Makefile.in
evolution-addressbook-export
evolution-addressbook-abuse
evolution-addressbook-clean

2
addressbook/tools/Makefile.am
View File

@ -45,6 +45,6 @@ CLEANFILES= evolution-addressbook-clean
evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \
sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \
< $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
&& mv evolution-addressbook-clean.tmp evolution-addressbook-clean