libpurple/purple-client.c

branch
release-2.x.y
changeset 35984
f7d395700c8b
parent 22582
838faa931042
child 34304
faf0414a8b51
--- a/libpurple/purple-client.c	Tue May 06 14:58:47 2014 +0200
+++ b/libpurple/purple-client.c	Tue May 06 15:05:42 2014 +0200
@@ -66,7 +66,10 @@
 {
 	GError *error = NULL;
 
-	g_type_init ();
+#if !GLIB_CHECK_VERSION(2, 36, 0)
+	/* GLib type system is automaticaly initialized since 2.36. */
+	g_type_init();
+#endif
 
 	bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (!bus)

mercurial