diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 064e762979..266ce2dc90 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2004-01-07 Rodney Dawes <dobey@ximian.com> + + * gui/component/addressbook-component.c: Move the smime_component_init + call to the instance init callback, rather than the class init, and + wrap it in #if HAVE_NSS, so the addressbook works without smime support + 2004-01-07 JP Rosevear <jpr@ximian.com> * gui/component/Makefile.am: link in printer stuff diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 1bc0799a73..f4cd1bece4 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -431,8 +431,6 @@ addressbook_component_class_init (AddressbookComponentClass *class) object_class->finalize = impl_finalize; parent_class = g_type_class_peek_parent (class); - - smime_component_init (); } static void @@ -453,6 +451,10 @@ addressbook_component_init (AddressbookComponent *component) priv->base_directory = g_build_filename (g_get_home_dir (), ".evolution", NULL); component->priv = priv; + +#if HAVE_NSS + smime_component_init (); +#endif } |