Really fix issue in 2a9e4d6
authorKlaus Ethgen <Klaus@Ethgen.de>
Mon, 7 Mar 2016 09:17:47 +0000 (10:17 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Mon, 7 Mar 2016 09:17:47 +0000 (10:17 +0100)
src/image-load.c
src/main.c

index 0f4d977..c2c4830 100644 (file)
@@ -99,11 +99,11 @@ static void image_loader_init(GTypeInstance *instance, gpointer g_class)
        il->can_destroy = TRUE;
 
 #ifdef HAVE_GTHREAD
-#if GTK_CHECK_VERSION(2,32,0)
+#if GLIB_CHECK_VERSION(2,32,0)
        il->data_mutex = g_new(GMutex, 1);
        g_mutex_init(il->data_mutex);
        il->can_destroy_cond = g_new(GCond, 1);
-       g_cond_init((il->can_destroy_cond);
+       g_cond_init(il->can_destroy_cond);
 #else
        il->data_mutex = g_mutex_new();
        il->can_destroy_cond = g_cond_new();
@@ -217,7 +217,7 @@ static void image_loader_finalize(GObject *object)
 
        file_data_unref(il->fd);
 #ifdef HAVE_GTHREAD
-#if GTK_CHECK_VERSION(2,32,0)
+#if GLIB_CHECK_VERSION(2,32,0)
        g_mutex_clear(il->data_mutex);
        g_free(il->data_mutex);
        g_cond_clear(il->can_destroy_cond);
@@ -1017,7 +1017,7 @@ static gboolean image_loader_start_thread(ImageLoader *il)
         if (!image_loader_thread_pool)
                {
                image_loader_thread_pool = g_thread_pool_new(image_loader_thread_run, NULL, -1, FALSE, NULL);
-#if GTK_CHECK_VERSION(2,32,0)
+#if GLIB_CHECK_VERSION(2,32,0)
                if (!image_loader_prio_cond) image_loader_prio_cond = g_new(GCond, 1);
                g_cond_init(image_loader_prio_cond);
                if (!image_loader_prio_mutex) image_loader_prio_mutex = g_new(GMutex, 1);
index d5ba24f..2ce0d67 100644 (file)
@@ -737,7 +737,7 @@ gint main(gint argc, gchar *argv[])
        CollectionData *cd = NULL;
 
 #ifdef HAVE_GTHREAD
-#if !GTK_CHECK_VERSION(2,32,0)
+#if !GLIB_CHECK_VERSION(2,32,0)
        g_thread_init(NULL);
 #endif
        gdk_threads_init();