[Pkg-telepathy-commits] [libnice] 33/265: examples: Remove g_type_init() call for recent GLib versions

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 43466b3b6419673ae2f02722b062a9337bc6da2c
Author: Philip Withnall <philip.withnall at collabora.co.uk>
Date:   Tue Dec 17 09:20:45 2013 +0000

    examples: Remove g_type_init() call for recent GLib versions
---
 examples/sdp-example.c      | 2 ++
 examples/simple-example.c   | 2 ++
 examples/threaded-example.c | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/examples/sdp-example.c b/examples/sdp-example.c
index 983f933..c6e9b7b 100644
--- a/examples/sdp-example.c
+++ b/examples/sdp-example.c
@@ -92,7 +92,9 @@ main(int argc, char *argv[])
     g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port);
   }
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
   g_type_init();
+#endif
 
   gloop = g_main_loop_new(NULL, FALSE);
 
diff --git a/examples/simple-example.c b/examples/simple-example.c
index 5cf5913..e3b367c 100644
--- a/examples/simple-example.c
+++ b/examples/simple-example.c
@@ -101,7 +101,9 @@ main(int argc, char *argv[])
     g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port);
   }
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
   g_type_init();
+#endif
 
   gloop = g_main_loop_new(NULL, FALSE);
   io_stdin = g_io_channel_unix_new(fileno(stdin));
diff --git a/examples/threaded-example.c b/examples/threaded-example.c
index c4da9fe..29d533a 100644
--- a/examples/threaded-example.c
+++ b/examples/threaded-example.c
@@ -101,7 +101,9 @@ main(int argc, char *argv[])
     g_debug("Using stun server '[%s]:%u'\n", stun_addr, stun_port);
   }
 
+#if !GLIB_CHECK_VERSION(2, 36, 0)
   g_type_init();
+#endif
 
   gloop = g_main_loop_new(NULL, FALSE);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git