From: Harald Hoyer <harald@redhat.com>
Date: Thu, 4 Apr 2013 07:02:28 +0000 (+0200)
Subject: test-bus-marshal.c: do not call g_type_init() for modern glib versions
X-Git-Tag: v201~66
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=34f856cbd013a73ba5d7f05fe6e9ff0233b92f15;p=elogind.git

test-bus-marshal.c: do not call g_type_init() for modern glib versions
---

diff --git a/src/libsystemd-bus/test-bus-marshal.c b/src/libsystemd-bus/test-bus-marshal.c
index e7d0cc7d7..20ae723fb 100644
--- a/src/libsystemd-bus/test-bus-marshal.c
+++ b/src/libsystemd-bus/test-bus-marshal.c
@@ -96,7 +96,9 @@ int main(int argc, char *argv[]) {
                 GDBusMessage *g;
                 char *p;
 
+#if !defined(GLIB_VERSION_2_36)
                 g_type_init();
+#endif
 
                 g = g_dbus_message_new_from_blob(buffer, sz, 0, NULL);
                 p = g_dbus_message_print(g, 0);