[systemd-commits] src/libsystemd-bus

[Harald Hoyer]

 src/libsystemd-bus/test-bus-marshal.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 34f856cbd013a73ba5d7f05fe6e9ff0233b92f15
Author: Harald Hoyer <harald at redhat.com>
Date:   Thu Apr 4 09:02:28 2013 +0200

    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 e7d0cc7..20ae723 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);