summaryrefslogtreecommitdiff
path: root/thumbnailer
diff options
context:
space:
mode:
authorPhilip Withnall <withnall@endlessm.com>2017-01-16 10:17:56 +0000
committerPhilip Withnall <withnall@endlessm.com>2017-02-07 10:59:12 +0000
commit8f6453c0cf6956d35afe9d8d789c959779564dd9 (patch)
treeb1acde72ccb5581df2de6499ee3fd9ef4b037c29 /thumbnailer
parentfe541abddc141b017a03b1b71df0a6f038acf13b (diff)
downloadgdk-pixbuf-8f6453c0cf6956d35afe9d8d789c959779564dd9.tar.gz
thumbnailer: Update from gnome-thumbnailer-skeleton master
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
Diffstat (limited to 'thumbnailer')
-rw-r--r--thumbnailer/gnome-thumbnailer-skeleton.c2
1 files changed, 2 insertions, 0 deletions
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);