X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fabort.c;h=9ee66fc3bc6ff1eb1a98b3ba16107796ffbd97ce;hb=refs%2Fheads%2Fgtk3;hp=26eb8c4d1c136a4c122ffb0ebaad2e738fe5b5bb;hpb=f0df98735cb5f3ff524be5689d45bb0ab4a27a74;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/abort.c b/libchimara/abort.c
index 26eb8c4..9ee66fc 100644
--- a/libchimara/abort.c
+++ b/libchimara/abort.c
@@ -6,7 +6,7 @@
 #include "chimara-glk-private.h"
 #include "window.h"
 
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
 
 /**
  * glk_set_interrupt_handler:
@@ -31,7 +31,7 @@ extern GPrivate *glk_data_key;
 void
 glk_set_interrupt_handler(void (*func)(void))
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	glk_data->interrupt_handler = func;
 }
 
@@ -40,7 +40,7 @@ user's interrupt handler. */
 static void
 abort_glk(void)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	if(glk_data->interrupt_handler)
 		(*(glk_data->interrupt_handler))();
 	shutdown_glk_pre();
@@ -57,7 +57,7 @@ abort_glk(void)
 void
 check_for_abort(void)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
 	g_mutex_lock(&glk_data->abort_lock);
 	if(glk_data->abort_signalled)
 	{
@@ -72,8 +72,8 @@ check_for_abort(void)
 void
 shutdown_glk_pre(void)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
 	/* Stop any timers */
 	glk_request_timer_events(0);
 	
@@ -123,8 +123,8 @@ shutdown_glk_pre(void)
 void
 shutdown_glk_post(void)
 {
-	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+	ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
 	/* Free all opaque objects; can't iterate normally, because the objects are
 	 being removed from the global iteration lists */
 	if(glk_data->root_window)
@@ -143,13 +143,7 @@ shutdown_glk_post(void)
 	/* Empty the event queue */
 	g_mutex_lock(&glk_data->event_lock);
 	g_queue_foreach(glk_data->event_queue, (GFunc)g_free, NULL);
-
-	/* COMPAT: g_queue_clear could be used here, but only appeared in 2.14 */
-	// g_queue_clear(glk_data->event_queue);
-	g_list_free(glk_data->event_queue->head);
-	glk_data->event_queue->head = glk_data->event_queue->tail = NULL;
-	glk_data->event_queue->length = 0;
-
+	g_queue_clear(glk_data->event_queue);
 	g_mutex_unlock(&glk_data->event_lock);
 
 	/* Reset the abort signaling mechanism */