# HG changeset patch # User Klaus Ethgen # Date 1457342267 -3600 # Node ID f119fa101ffb6b86e10e4a32ac728bb889ba977b # Parent 5a9bdebb109fcb61d8f35525d1a96f06c732a514 Really fix issue in 2a9e4d6 diff -r 5a9bdebb109f -r f119fa101ffb src/image-load.c --- a/src/image-load.c Sun Mar 06 23:49:43 2016 +0100 +++ b/src/image-load.c Mon Mar 07 10:17:47 2016 +0100 @@ -99,11 +99,11 @@ 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 @@ 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 @@ 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); diff -r 5a9bdebb109f -r f119fa101ffb src/main.c --- a/src/main.c Sun Mar 06 23:49:43 2016 +0100 +++ b/src/main.c Mon Mar 07 10:17:47 2016 +0100 @@ -737,7 +737,7 @@ 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();