Fixes accepted SSL certs not loaded when using alternative config dir.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2635 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e1460d5..5927f0e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-27
+
+	* libsylph/sylmain.c
+	  src/main.c: moved ssl_init()/ssl_done() from
+	  syl_init()/syl_cleanup() to src/main. Fixes accepted SSL certs
+	  not loaded when using alternative config dir.
+
 2010-07-23
 
 	* libsylph/virtual.c
diff --git a/libsylph/sylmain.c b/libsylph/sylmain.c
index 97e078dd..bcd677b1 100644
--- a/libsylph/sylmain.c
+++ b/libsylph/sylmain.c
@@ -230,9 +230,6 @@ void syl_init(void)
 #endif
 
 	sock_init();
-#if USE_SSL
-	ssl_init();
-#endif
 
 #ifdef G_OS_UNIX
 	/* ignore SIGPIPE signal for preventing sudden death of program */
@@ -326,9 +323,6 @@ void syl_cleanup(void)
 #endif
 	close_log_file();
 
-#if USE_SSL
-	ssl_done();
-#endif
 	sock_cleanup();
 
 	if (app) {
diff --git a/src/main.c b/src/main.c
index d3a7c94f..46e7091d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -253,6 +253,7 @@ int main(int argc, char *argv[])
 	set_progress_func(main_window_progress_show);
 	set_input_query_password_func(input_dialog_query_password);
 #if USE_SSL
+	ssl_init();
 	ssl_set_verify_func(ssl_manager_verify_cert);
 #endif
 
@@ -817,6 +818,9 @@ void app_will_exit(gboolean force)
 	g_free(filename);
 
 	/* remove temporary files, close log file, socket cleanup */
+#if USE_SSL
+	ssl_done();
+#endif
 	syl_cleanup();
 	lock_socket_remove();