X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=b6b88c742ebb1d33ebbbb38543ee6166dd087827;hb=59062a4b466283aedfe8a5858062b4cf759f0c93;hp=4af716b40e70883d5f458fc7874a3c812035304c;hpb=cc7434f897ab31bb797b519404100aae1da4fd81;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 4af716b..b6b88c7 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -88,6 +88,7 @@ chimara_glk_init(ChimaraGlk *self)
 	priv->css_file = "style.css";
 	priv->default_styles = g_new0(StyleSet,1);
 	priv->current_styles = g_new0(StyleSet,1);
+	priv->pager_attr_list = pango_attr_list_new();
 	priv->style_initialized = FALSE;
 	priv->final_message = g_strdup("[ The game has finished ]");
 	priv->running = FALSE;
@@ -191,6 +192,7 @@ chimara_glk_finalize(GObject *object)
 	g_hash_table_destroy(priv->default_styles->text_grid);
 	g_hash_table_destroy(priv->current_styles->text_buffer);
 	g_hash_table_destroy(priv->current_styles->text_grid);
+	pango_attr_list_unref(priv->pager_attr_list);
 	priv->style_initialized = FALSE;
 	
     /* Free the event queue */
@@ -577,11 +579,6 @@ chimara_glk_stopped(ChimaraGlk *self)
 {
     CHIMARA_GLK_USE_PRIVATE(self, priv);
     priv->running = FALSE;
-
-    /* Free the plugin */
-	if( priv->program && !g_module_close(priv->program) )
-	    g_warning( "Error closing module: %s", g_module_error() );
-	priv->program = NULL;
 }
 
 static void
@@ -615,9 +612,16 @@ chimara_glk_text_buffer_output(ChimaraGlk *self, guint window_rock, gchar *text)
 	/* Default signal handler */
 }
 
-/* G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
+/* COMPAT: G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
 #ifndef G_PARAM_STATIC_STRINGS
+
+/* COMPAT: G_PARAM_STATIC_NAME and friends only appeared in GTK 2.8 */
+#if GTK_CHECK_VERSION(2,8,0)
 #define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
+#else
+#define G_PARAM_STATIC_STRINGS (0)
+#endif
+
 #endif
 
 static void
@@ -1105,7 +1109,9 @@ glk_enter(struct StartupData *startup)
 	
 	/* Run main function */
 	glk_main_t glk_main = startup->glk_main;
-	g_slice_free(struct StartupData, startup);
+	
+	/* COMPAT: avoid usage of slices */
+	g_free(startup);
     g_signal_emit_by_name(startup->glk_data->self, "started");
 	glk_main();
 	glk_exit(); /* Run shutdown code in glk_exit() even if glk_main() returns normally */
@@ -1144,10 +1150,16 @@ chimara_glk_run(ChimaraGlk *glk, const gchar *plugin, int argc, char *argv[], GE
 	}
     
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
-	struct StartupData *startup = g_slice_new0(struct StartupData);
+
+	/* COMPAT: avoid usage of slices */
+	struct StartupData *startup = g_new0(struct StartupData,1);
 	
-    /* Open the module to run */
     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 */
+	if( priv->program && !g_module_close(priv->program) )
+		g_warning( "Error closing module :%s", g_module_error() );
+	/* Open the module to run */
     priv->program = g_module_open(plugin, G_MODULE_BIND_LAZY);
     
     if(!priv->program)