Remove support for older GLib and GTK versions

The iLiad Reader was holding us back to GTK 2.6, but that product
is discontinued and the company is bankrupt.

diff --git a/configure.ac b/configure.ac
index b403f55679d079823ab36984f921297ebea35571..0e77f25529632bd12c850b67612ca110cb1a20f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,7 @@ LT_VERSION_INFO="$CHIMARA_CURRENT:$CHIMARA_REVISION:$CHIMARA_AGE"
 AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################
-# Recommended GTK version: at least 2.12
-GTK_REQUIRED_VERSION=2.6
+GTK_REQUIRED_VERSION=2.18
 GLIB_REQUIRED_VERSION=2.32
 GTK_DOC_REQUIRED_VERSION=1.12
 AC_SUBST(GTK_REQUIRED_VERSION)

diff --git a/libchimara/abort.c b/libchimara/abort.c
index 3e855366ac34ea6a70ee23c46aade806e416f75f..9ee66fc3bc6ff1eb1a98b3ba16107796ffbd97ce 100644 (file)
--- a/libchimara/abort.c
+++ b/libchimara/abort.c
@@ -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 */

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 6b1527be9501111236075fac7da37c0ee67b5224..842555eec89ca7b62484f0ca9986c2b3a6d68b6a 100644 (file)
--- 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 */