daemon: improve purple code for better cleanup.

Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/daemon/purple.c b/src/daemon/purple.c
index 882ea61..138b30b 100644
--- a/src/daemon/purple.c
+++ b/src/daemon/purple.c
@@ -156,9 +156,11 @@ static void *purple_spawn(void *disregard)
 	char *user = NULL;
 	char *password = NULL;
 	char *proto = NULL;
+	int cancelstate;
 
 	(void) disregard;
 
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancelstate);
 	pthread_cleanup_push(pthread_mutex_unlock_thunk, &state.mutex);
 
 	progname = setting_progname();
@@ -203,8 +205,11 @@ static void *purple_spawn(void *disregard)
 
 	pthread_cleanup_push(purple_account_destroy_thunk, state.account);
 
-	g_main_loop_run(loop);
 	pthread_cleanup_push(g_main_loop_quit_thunk, loop);
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &cancelstate);
+	pthread_testcancel();
+
+	g_main_loop_run(loop);
 
 	pthread_cleanup_pop(1);
 	pthread_cleanup_pop(1);