From 8f6453c0cf6956d35afe9d8d789c959779564dd9 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 16 Jan 2017 10:17:56 +0000
Subject: thumbnailer: Update from gnome-thumbnailer-skeleton master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/hadess/gnome-thumbnailer-skeleton/commits/master

Add version checks around g_type_init() call

g_type_init() was deprecated (made unnecessary) in GLib 2.36.0, so don’t
call it if we are compiled against a new enough version of GLib.

https://bugzilla.gnome.org/show_bug.cgi?id=777315
---
 thumbnailer/gnome-thumbnailer-skeleton.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'thumbnailer')

diff --git a/thumbnailer/gnome-thumbnailer-skeleton.c b/thumbnailer/gnome-thumbnailer-skeleton.c
index 812b58441..10b8d73cb 100644
--- a/thumbnailer/gnome-thumbnailer-skeleton.c
+++ b/thumbnailer/gnome-thumbnailer-skeleton.c
@@ -231,7 +231,9 @@ int main (int argc, char **argv)
 	gsize length;
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
 	g_type_init ();
+#endif
 
 	/* Options parsing */
 	context = g_option_context_new (THUMBNAILER_USAGE);
-- 
cgit v1.2.1