aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2004-01-08 04:23:52 +0800
committerRodney Dawes <dobey@src.gnome.org>2004-01-08 04:23:52 +0800
commita5ae4136604265be108fc422e3b3340df2570979 (patch)
treed0dd4fe711df6b874f9b0d097022f0d2e9e691ea /addressbook
parent37ed2b4262c949bc204315313fb11dcdc5cd5943 (diff)
downloadgsoc2013-evolution-a5ae4136604265be108fc422e3b3340df2570979.tar
gsoc2013-evolution-a5ae4136604265be108fc422e3b3340df2570979.tar.gz
gsoc2013-evolution-a5ae4136604265be108fc422e3b3340df2570979.tar.bz2
gsoc2013-evolution-a5ae4136604265be108fc422e3b3340df2570979.tar.lz
gsoc2013-evolution-a5ae4136604265be108fc422e3b3340df2570979.tar.xz
gsoc2013-evolution-a5ae4136604265be108fc422e3b3340df2570979.tar.zst
gsoc2013-evolution-a5ae4136604265be108fc422e3b3340df2570979.zip
Move the smime_component_init call to the instance init callback, rather
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 svn path=/trunk/; revision=24092
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/addressbook-component.c6
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
}