Drop support of GLib < 2.32

1 files changed, 0 insertions, 29 deletions

diff --git a/tumblerd/tumbler-specialized-thumbnailer.c b/tumblerd/tumbler-specialized-thumbnailer.c
index 38aff6f..01d9cee 100644
--- a/tumblerd/tumbler-specialized-thumbnailer.c
+++ b/tumblerd/tumbler-specialized-thumbnailer.c
@@ -95,11 +95,7 @@ struct _TumblerSpecializedThumbnailer
 struct _SpecializedInfo
 {
   TumblerThumbnailer *thumbnailer;
-#if GLIB_CHECK_VERSION (2, 32, 0)
   GCond               condition;
-#else
-  GCond              *condition;
-#endif
   TUMBLER_MUTEX       (mutex);
   const gchar        *uri;
   const gchar        *mime_type;
@@ -337,11 +333,7 @@ thumbnailer_proxy_g_signal_cb (GDBusProxy *proxy,
           if (info->handle == handle) 
             {
               tumbler_mutex_lock (info->mutex);
-#if GLIB_CHECK_VERSION (2, 32, 0)
               g_cond_broadcast (&info->condition);
-#else
-              g_cond_broadcast (info->condition);
-#endif
               info->had_callback = TRUE;
               tumbler_mutex_unlock (info->mutex);
             }  
@@ -384,11 +376,7 @@ tumbler_specialized_thumbnailer_create (TumblerThumbnailer *thumbnailer,
 {
   TumblerSpecializedThumbnailer *s;
   SpecializedInfo                sinfo;
-#if GLIB_CHECK_VERSION (2, 32, 0)
   gint64                         end_time;
-#else
-  GTimeVal                       timev;
-#endif
   TumblerThumbnail              *thumbnail;
   TumblerThumbnailFlavor        *flavor;
   GVariant                      *result;
@@ -407,11 +395,7 @@ tumbler_specialized_thumbnailer_create (TumblerThumbnailer *thumbnailer,
 
   s = TUMBLER_SPECIALIZED_THUMBNAILER (thumbnailer);
 
-#if GLIB_CHECK_VERSION (2, 32, 0)
   g_cond_init (&sinfo.condition);
-#else
-  sinfo.condition = g_cond_new ();
-#endif
   sinfo.had_callback = FALSE;
   tumbler_mutex_create (sinfo.mutex);
   sinfo.uri = uri;
@@ -441,12 +425,7 @@ tumbler_specialized_thumbnailer_create (TumblerThumbnailer *thumbnailer,
       g_variant_unref (result);
         
       /* 100 seconds worth of timeout */
-#if GLIB_CHECK_VERSION (2, 32, 0)
      end_time = g_get_monotonic_time () + 100 * G_TIME_SPAN_SECOND;
-#else
-      g_get_current_time (&timev);
-      g_time_val_add  (&timev, 100000000); 
-#endif
 
       tumbler_mutex_lock (sinfo.mutex);
 
@@ -454,11 +433,7 @@ tumbler_specialized_thumbnailer_create (TumblerThumbnailer *thumbnailer,
        * be running to receive the error and ready signals */
       if (!sinfo.had_callback)
         {
-#if GLIB_CHECK_VERSION (2, 32, 0)
           if (!g_cond_wait_until (&sinfo.condition, &sinfo.mutex, end_time))
-#else
-          if (!g_cond_timed_wait (sinfo.condition, sinfo.mutex, &timev))
-#endif
             {
               message = g_strdup (_("Failed to call the specialized thumbnailer: timeout"));
               g_signal_emit_by_name (thumbnailer, "error", uri, 1, message);
@@ -478,11 +453,7 @@ tumbler_specialized_thumbnailer_create (TumblerThumbnailer *thumbnailer,
   
   g_signal_handler_disconnect (s->proxy, handler_id);
 
-#if GLIB_CHECK_VERSION (2, 32, 0)
   g_cond_clear (&sinfo.condition);
-#else
-  g_cond_free (sinfo.condition);
-#endif
 }
 
 static void