summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2014-01-24 13:39:04 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2014-01-24 13:39:23 +0100
commit851ecce5d86656393deaa828fe856f40d2d6c02f (patch)
tree821e70ccdcaaade4fc699b6c120f9c724215fbc1
parentc25bbd8b8cc9aeae31ee689518ebfc6487197102 (diff)
downloadcmumble-851ecce5d86656393deaa828fe856f40d2d6c02f.tar.gz
cmumble-851ecce5d86656393deaa828fe856f40d2d6c02f.tar.bz2
cmumble-851ecce5d86656393deaa828fe856f40d2d6c02f.zip
Remove deprecated g_type_initaudio-2
It does nothing as of glib version 2.36.
-rw-r--r--configure.ac2
-rw-r--r--src/cmumble.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b65d62e..331a9a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(PROTOBUF, [libprotobuf-c],[], [
AC_CHECK_LIB([protobuf-c], [protobuf_c_message_pack_to_buffer], [],
[AC_MSG_ERROR([libprotobuf-c not found])])
])
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36])
PKG_CHECK_MODULES(GIO, [gio-2.0])
PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 gstreamer-app-1.0 gstreamer-tag-1.0])
PKG_CHECK_MODULES(CELT, [celt])
diff --git a/src/cmumble.c b/src/cmumble.c
index 8267834..dd9b5d5 100644
--- a/src/cmumble.c
+++ b/src/cmumble.c
@@ -356,7 +356,6 @@ int main(int argc, char **argv)
cm.users = NULL;
cm.verbose = verbose;
- g_type_init();
cm.loop = g_main_loop_new(NULL, FALSE);
cm.callbacks = (const callback_t *) &callbacks;