Use g_cond_wait_until() instead of g_cond_timed_wait()

This bumps the GLib version requirement to 2.32; that is also the
version in which g_cond_timed_wait() was deprecated.

diff --git a/configure.ac b/configure.ac
index 158d334b661f5f3710a1a2a4e69479a72dc58fe6..b403f55679d079823ab36984f921297ebea35571 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,8 @@ AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################
 # Recommended GTK version: at least 2.12
-# Recommended Glib version: at least 2.16
 GTK_REQUIRED_VERSION=2.6
-GLIB_REQUIRED_VERSION=2.6
+GLIB_REQUIRED_VERSION=2.32
 GTK_DOC_REQUIRED_VERSION=1.12
 AC_SUBST(GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_REQUIRED_VERSION)

diff --git a/libchimara/event.c b/libchimara/event.c
index 7c916c073b5b8e4eef94b41dd387389f876c653c..dd348a960325836ff8c2174f3a710bf0575ce752 100644 (file)
--- a/libchimara/event.c
+++ b/libchimara/event.c
@@ -23,17 +23,15 @@ event_throw(ChimaraGlk *glk, glui32 type, winid_t win, glui32 val1, glui32 val2)
        if(!priv->event_queue)
                return;
 
-       GTimeVal timeout;
-       g_get_current_time(&timeout);
-       g_time_val_add(&timeout, EVENT_TIMEOUT_MICROSECONDS);
+       gint64 timeout = g_get_monotonic_time() + EVENT_TIMEOUT_MICROSECONDS;
 
        g_mutex_lock(&priv->event_lock);
 
        /* Wait for room in the event queue */
        while( g_queue_get_length(priv->event_queue) >= EVENT_QUEUE_MAX_LENGTH )
-               if( !g_cond_timed_wait(&priv->event_queue_not_full, &priv->event_lock, &timeout) ) 
+               if( !g_cond_wait_until(&priv->event_queue_not_full, &priv->event_lock, timeout) )
                {
-                       /* Drop the event after 3 seconds */
+                       /* Drop the event if the event queue is still not emptying */
                        g_mutex_unlock(&priv->event_lock);
                        return;
                }