Mercurial Mercurial > loudmouth / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable g_type_init for glib >= 2.35
authorFrank Zschockelt <lm@freakysoft.de>
Thu, 24 Oct 2013 21:48:41 +0200
changeset 648 b29eecd0ac08
parent 647 2e35e7499ee8
child 649 96edb03ec74e
Disable g_type_init for glib >= 2.35
loudmouth/lm-connection.c file | annotate | diff | comparison | revisions
loudmouth/test-dns.c file | annotate | diff | comparison | revisions 
--- a/loudmouth/lm-connection.c	Mon Jan 21 14:52:25 2013 +0200
+++ b/loudmouth/lm-connection.c	Thu Oct 24 21:48:41 2013 +0200
@@ -1175,7 +1175,9 @@
     LmConnection *connection;
     gint          i;
 
+#if !GLIB_CHECK_VERSION(2, 35, 0)
     g_type_init (); /* Ensure that the GLib type library is initialized */
+#endif
     lm_debug_init ();
     _lm_sock_library_init ();
 
--- a/loudmouth/test-dns.c	Mon Jan 21 14:52:25 2013 +0200
+++ b/loudmouth/test-dns.c	Thu Oct 24 21:48:41 2013 +0200
@@ -40,7 +40,9 @@
 #endif
     LmResolver *srv_resolver;
 
+#if !GLIB_CHECK_VERSION(2, 35, 0)
     g_type_init ();
+#endif
 #if 0
     resolver = lm_resolver_new_for_host ("kenny.imendio.com",
                                          resolver_result_cb,
loudmouth