From 074acf9fc41c08be14c80939049179ed54209ffc Mon Sep 17 00:00:00 2001 From: Alexander Schwinn Date: Tue, 15 Dec 2020 23:08:03 +0100 Subject: Remove GLIB_CHECK_VERSION IFDEFs which are obsolete after glib bump Current glib minimum is 2.50.0 --- tumblerd/main.c | 12 ------------ tumblerd/tumbler-utils.h | 8 -------- 2 files changed, 20 deletions(-) diff --git a/tumblerd/main.c b/tumblerd/main.c index 2c2d8da..e93c83b 100644 --- a/tumblerd/main.c +++ b/tumblerd/main.c @@ -267,18 +267,6 @@ main (int argc, /* set the application name. Translators: Don't translate "Tumbler". */ g_set_application_name (_("Tumbler Thumbnailing Service")); -#if !GLIB_CHECK_VERSION (2, 36, 0) - /* initialize the GLib type system */ - g_type_init (); -#endif - -#if !GLIB_CHECK_VERSION (2, 32, 0) - /* initialize threading system */ - if (!g_thread_supported ()) - g_thread_init (NULL); -#endif - - connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); if (error != NULL) diff --git a/tumblerd/tumbler-utils.h b/tumblerd/tumbler-utils.h index 584e845..b319237 100644 --- a/tumblerd/tumbler-utils.h +++ b/tumblerd/tumbler-utils.h @@ -55,19 +55,11 @@ G_BEGIN_DECLS } \ }G_STMT_END -#if GLIB_CHECK_VERSION (2, 32, 0) #define TUMBLER_MUTEX(mtx) GMutex mtx #define tumbler_mutex_free(mtx) g_mutex_clear (&(mtx)) #define tumbler_mutex_lock(mtx) g_mutex_lock (&(mtx)) #define tumbler_mutex_unlock(mtx) g_mutex_unlock (&(mtx)) #define tumbler_mutex_create(mtx) g_mutex_init (&(mtx)) -#else -#define TUMBLER_MUTEX(mtx) GMutex *mtx -#define tumbler_mutex_free(mtx) g_mutex_free (mtx) -#define tumbler_mutex_lock(mtx) g_mutex_lock (mtx) -#define tumbler_mutex_unlock(mtx) g_mutex_unlock (mtx) -#define tumbler_mutex_create(mtx) (mtx) = g_mutex_new () -#endif G_END_DECLS -- cgit v1.2.1