diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/component/component-factory.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index a1e13f43d3..6a917ef274 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,11 @@ 2004-02-19 Chris Toshok <toshok@ximian.com> + * gui/component/component-factory.c: s/HAVE_NSS/ENABLE_SMIME. + + * gui/component/addressbook-component.c: s/HAVE_NSS/ENABLE_SMIME. + +2004-02-19 Chris Toshok <toshok@ximian.com> + * gui/component/addressbook.c (activate_source): split out the majority of the set_prop code for PROPERTY_SOURCE_UID_IDX here, so it can be used for both SOURCE_UID and FOLDER_URI. diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 9468fbaf87..aa2300b957 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -48,7 +48,7 @@ #include <gconf/gconf-client.h> #include <gal/util/e-util.h> -#if HAVE_NSS +#ifdef ENABLE_SMIME #include "smime/gui/component.h" #endif @@ -491,7 +491,7 @@ addressbook_component_init (AddressbookComponent *component) component->priv = priv; -#if HAVE_NSS +#ifdef ENABLE_SMIME smime_component_init (); #endif } diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index 08bf146691..f8ac672d01 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -30,7 +30,7 @@ #include "eab-popup-control.h" #include "eab-vcard-control.h" #include "select-names/e-select-names-bonobo.h" -#if HAVE_NSS +#ifdef ENABLE_SMIME #include "smime/gui/certificate-manager.h" #endif #include <bonobo/bonobo-shlib-factory.h> @@ -75,7 +75,7 @@ factory (BonoboGenericFactory *factory, #endif if (strcmp (component_id, SELECT_NAMES_ID) == 0) return BONOBO_OBJECT (e_select_names_bonobo_new ()); -#if HAVE_NSS +#ifdef ENABLE_SMIME if (strcmp (component_id, CERTIFICATE_MANAGER_CONFIG_CONTROL_ID) == 0) return BONOBO_OBJECT (certificate_manager_config_control_new ()); #endif |