diff options
| author | Chris Toshok <toshok@ximian.com> | 2003-10-24 01:24:59 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2003-10-24 01:24:59 +0800 |
| commit | 00829a70127fb8feb7c8fb1cfe4ba93e0321ab07 (patch) | |
| tree | c6f5b30e6b34b885f95ba25ac1b647145b252f38 | |
| parent | 71e7cc38901659a492fcaf364e9cef63275fb85f (diff) | |
| download | gsoc2013-evolution-00829a70127fb8feb7c8fb1cfe4ba93e0321ab07.tar.gz gsoc2013-evolution-00829a70127fb8feb7c8fb1cfe4ba93e0321ab07.tar.zst gsoc2013-evolution-00829a70127fb8feb7c8fb1cfe4ba93e0321ab07.zip | |
convert 8 spaces to a tab.
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
| -rw-r--r-- | addressbook/ChangeLog | 15 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/component-factory.c | 4 | ||||
| -rw-r--r-- | addressbook/tools/.cvsignore | 2 | ||||
| -rw-r--r-- | addressbook/tools/Makefile.am | 2 |
5 files changed, 23 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 34c2c58ae9..bfa617f432 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -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 diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 4234997e1d..bf9064a132 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -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 \ diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index 512ab72f2a..a79db23fc0 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -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; diff --git a/addressbook/tools/.cvsignore b/addressbook/tools/.cvsignore index 8e22df3d63..25963ae030 100644 --- a/addressbook/tools/.cvsignore +++ b/addressbook/tools/.cvsignore @@ -1,3 +1,5 @@ Makefile Makefile.in evolution-addressbook-export +evolution-addressbook-abuse +evolution-addressbook-clean diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am index c9e082603e..bea3e09d8c 100644 --- a/addressbook/tools/Makefile.am +++ b/addressbook/tools/Makefile.am @@ -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 |