evolution r37076 - branches/kill-bonobo/addressbook/gui/component

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Jan 15 04:48:27 2009
New Revision: 37076
URL: http://svn.gnome.org/viewvc/evolution?rev=37076&view=rev

Log:
Activate S/MIME support and add the "Certificates" section to preferences.
... But why is this initialized from the address book?  Seems arbitrary.


Modified:
   branches/kill-bonobo/addressbook/gui/component/e-book-shell-module.c

Modified: branches/kill-bonobo/addressbook/gui/component/e-book-shell-module.c
==============================================================================
--- branches/kill-bonobo/addressbook/gui/component/e-book-shell-module.c	(original)
+++ branches/kill-bonobo/addressbook/gui/component/e-book-shell-module.c	Thu Jan 15 04:48:27 2009
@@ -19,6 +19,8 @@
  *
  */
 
+#include <config.h>
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <libebook/e-book.h>
@@ -44,6 +46,11 @@
 #include "e-book-shell-view.h"
 #include "e-book-shell-module-migrate.h"
 
+#ifdef ENABLE_SMIME
+#include "smime/gui/component.h"
+#include "smime/gui/certificate-manager.h"
+#endif
+
 #define MODULE_NAME		"addressbook"
 #define MODULE_ALIASES		"contacts"
 #define MODULE_SCHEMES		""
@@ -433,6 +440,13 @@
 		shell_module, &module_info,
 		e_book_shell_view_get_type (type_module));
 
+	/* XXX Why is this here?  Address books aren't the only
+	 *     things that use S/MIME.  Maybe put it in EShell? */
+#ifdef ENABLE_SMIME
+	smime_component_init ();
+	certificate_manager_config_init ();
+#endif
+
 	book_shell_module_init_importers ();
 	book_shell_module_ensure_sources (shell_module);