evolution-data-server r9411 - in trunk: camel docs/reference/camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Aug 21 02:20:37 2008
New Revision: 9411
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9411&view=rev

Log:
2008-08-20  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #546926

	* camel/camel.c (camel_shutdown):
	Make this function public and don't call PR_Cleanup().

	* camel/camel.c (camel_init):
	Remove call to g_atexit().



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel.c
   trunk/camel/camel.h
   trunk/docs/reference/camel/camel-sections.txt

Modified: trunk/camel/camel.c
==============================================================================
--- trunk/camel/camel.c	(original)
+++ trunk/camel/camel.c	Thu Aug 21 02:20:37 2008
@@ -48,30 +48,6 @@
 
 int camel_application_is_exiting = FALSE;
 
-static void
-camel_shutdown (void)
-{
-	CamelCertDB *certdb;
-
-	if (!initialised)
-		return;
-
-	certdb = camel_certdb_get_default ();
-	if (certdb) {
-		camel_certdb_save (certdb);
-		camel_object_unref (certdb);
-	}
-
-	/* These next calls must come last. */
-
-#if defined (HAVE_NSS)
-	NSS_Shutdown ();
-	PR_Cleanup ();
-#endif /* HAVE_NSS */
-
-	initialised = FALSE;
-}
-
 int
 camel_init (const char *configdir, gboolean nss_init)
 {
@@ -140,9 +116,30 @@
 	
 	camel_object_unref (certdb);
 	
-	g_atexit (camel_shutdown);
-	
 	initialised = TRUE;
 	
 	return 0;
 }
+
+void
+camel_shutdown (void)
+{
+	CamelCertDB *certdb;
+
+	if (!initialised)
+		return;
+
+	certdb = camel_certdb_get_default ();
+	if (certdb) {
+		camel_certdb_save (certdb);
+		camel_object_unref (certdb);
+	}
+
+	/* These next calls must come last. */
+
+#if defined (HAVE_NSS)
+	NSS_Shutdown ();
+#endif /* HAVE_NSS */
+
+	initialised = FALSE;
+}

Modified: trunk/camel/camel.h
==============================================================================
--- trunk/camel/camel.h	(original)
+++ trunk/camel/camel.h	Thu Aug 21 02:20:37 2008
@@ -143,6 +143,7 @@
 G_BEGIN_DECLS
 
 int camel_init (const char *certdb_dir, gboolean nss_init);
+void camel_shutdown (void);
 
 G_END_DECLS
 

Modified: trunk/docs/reference/camel/camel-sections.txt
==============================================================================
--- trunk/docs/reference/camel/camel-sections.txt	(original)
+++ trunk/docs/reference/camel/camel-sections.txt	Thu Aug 21 02:20:37 2008
@@ -3855,6 +3855,7 @@
 <SECTION>
 <FILE>camel</FILE>
 camel_init
+camel_shutdown
 </SECTION>
 
 <SECTION>