X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fglk.c;h=4304aefae2aa0c80500df836f136f3817d65a693;hb=b85e6bd2c1dfd95b4972429512355dc69f483633;hp=2f7e10f719184cfcba5094948d034599c0553d02;hpb=14277dd3a2329156b20a87be10d9882fcad2cb23;p=rodin%2Fchimara.git

diff --git a/libchimara/glk.c b/libchimara/glk.c
index 2f7e10f..4304aef 100644
--- a/libchimara/glk.c
+++ b/libchimara/glk.c
@@ -6,7 +6,7 @@
 #include "chimara-glk-private.h"
 #include "gi_blorb.h"
 
-G_GNUC_INTERNAL ChimaraGlkPrivate *glk_data = NULL;
+G_GNUC_INTERNAL GPrivate *glk_data_key = NULL;
 
 /**
  * glk_exit:
@@ -42,19 +42,7 @@ G_GNUC_INTERNAL ChimaraGlkPrivate *glk_data = NULL;
 void
 glk_exit(void)
 {
-	if(!glk_data->in_startup)
-		g_signal_emit_by_name(glk_data->self, "stopped");
-
-	/* Stop any timers */
-	glk_request_timer_events(0);
-
-	/* Close any open resource files */
-	if(glk_data->resource_map != NULL) {
-		giblorb_destroy_map(glk_data->resource_map);
-		glk_stream_close(glk_data->resource_file, NULL);
-	}
-
-    glk_data = NULL;
+	shutdown_glk();
 	g_thread_exit(NULL);
 }