Call camel_mime_utils_shutdown() and camel_operation_shutdown().

2004-06-18  Jeffrey Stedfast  <fejj@novell.com>

	* camel.c (camel_shutdown): Call camel_mime_utils_shutdown() and
	camel_operation_shutdown().
	(camel_init): Don't register camel_shutdown() as an atexit
	handler.

	* camel-operation.c (camel_operation_shutdown): New function.

	* camel-mime-utils.c (camel_mime_utils_shutdown): New function to
	clean up the compiled regexes.

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 0b1745b..40d1292 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -2,6 +2,8 @@
 
        * camel.c (camel_shutdown): Call camel_mime_utils_shutdown() and
        camel_operation_shutdown().
+       (camel_init): Don't register camel_shutdown() as an atexit
+       handler.
 
        * camel-operation.c (camel_operation_shutdown): New function.
 

diff --git a/camel/camel.c b/camel/camel.c
index f370d89..a3f4961 100644 (file)
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -43,7 +43,7 @@
 
 static int initialised = FALSE;
 
-static void
+void
 camel_shutdown (void)
 {
        void camel_operation_shutdown (void);
@@ -123,8 +123,6 @@ camel_init (const char *configdir, gboolean nss_init)
        
        camel_object_unref (certdb);
        
-       g_atexit (camel_shutdown);
-       
        initialised = TRUE;
        
        return 0;

diff --git a/camel/camel.h b/camel/camel.h
index c61ca93..edc1e31 100644 (file)
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -87,7 +87,8 @@ extern "C" {
 #include <camel/camel-url.h>
 #include <camel/camel-string-utils.h>
 
-gint camel_init (const char *certdb_dir, gboolean nss_init);
+int camel_init (const char *certdb_dir, gboolean nss_init);
+void camel_shutdown (void);
 
 #ifdef __cplusplus
 }