X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=842555eec89ca7b62484f0ca9986c2b3a6d68b6a;hb=f5db24dd1391233559a69d17f2076ffe988b4384;hp=6b1527be9501111236075fac7da37c0ee67b5224;hpb=811704f41f1232cd58947895cdc8d0e5a022b92d;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 6b1527b..842555e 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -155,9 +155,8 @@ chimara_glk_init(ChimaraGlk *self)
 	priv->pager_attr_list = pango_attr_list_new();
 	priv->final_message = g_strdup("[ The game has finished ]");
     priv->event_queue = g_queue_new();
-	priv->char_input_queue = g_async_queue_new();
-	priv->line_input_queue = g_async_queue_new();
-	/* FIXME Should be g_async_queue_new_full(g_free); but only in GTK >= 2.16 */
+	priv->char_input_queue = g_async_queue_new_full(g_free);
+	priv->line_input_queue = g_async_queue_new_full(g_free);
 
 	g_mutex_init(&priv->event_lock);
 	g_mutex_init(&priv->abort_lock);
@@ -1173,7 +1172,7 @@ free_startup_data(struct StartupData *startup)
 	while(i < startup->args.argc)
 		g_free(startup->args.argv[i++]);
 	g_free(startup->args.argv);
-	g_free(startup);
+	g_slice_free(struct StartupData, startup);
 }
 
 /* glk_enter() is the actual function called in the new thread in which
@@ -1203,8 +1202,8 @@ glk_enter(struct StartupData *startup)
 	/* Run main function */
 	glk_main_t glk_main = startup->glk_main;
 
-	/* COMPAT: avoid usage of slices */
 	g_signal_emit_by_name(startup->glk_data->self, "started");
+
 	glk_main();
 	free_startup_data(startup);
 	glk_exit(); /* Run shutdown code in glk_exit() even if glk_main() returns normally */
@@ -1246,9 +1245,8 @@ chimara_glk_run(ChimaraGlk *glk, const gchar *plugin, int argc, char *argv[], GE
     
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
 
-	/* COMPAT: avoid usage of slices */
-	struct StartupData *startup = g_new0(struct StartupData,1);
-	
+	struct StartupData *startup = g_slice_new0(struct StartupData);
+
     g_assert( g_module_supported() );
 	/* If there is already a module loaded, free it first -- you see, we want to
 	 * keep modules loaded as long as possible to avoid crashes in stack unwinding */