Mercurial > hg > forks > geeqie
changeset 2282:838e6b67aeb7
Merge branch 'compiler_warnings'
* compiler_warnings:
Really fix issue in 2a9e4d6
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Mon, 07 Mar 2016 10:18:00 +0100 |
| parents | b523c366b192 (current diff) f119fa101ffb (diff) |
| children | 54e5be1b1399 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image-load.c Mon Mar 07 00:00:26 2016 +0100 +++ b/src/image-load.c Mon Mar 07 10:18:00 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);