[next] telepathy-glib: add missing config.h includes

Simon McVittie smcv at kemper.freedesktop.org
Thu Sep 12 08:20:20 PDT 2013


Module: telepathy-glib
Branch: next
Commit: 7504f033d03bf8d36ed80229e7e4dcb88056e5dc
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=7504f033d03bf8d36ed80229e7e4dcb88056e5dc

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Jan  8 09:59:13 2013 +0100

add missing config.h includes

g_type_init() has been deprecated in GLib master. By including config.h we
avoid the deprecation warning as it contains GLib's versions macros.

(cherry picked from commit b3570e8e77cb890c62744dc62859c49a6bebd8aa)
Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Conflicts:
	tests/dbus/call-channel.c

---

 examples/client/dbus-tubes/accepter.c   |    2 ++
 examples/client/dbus-tubes/offerer.c    |    2 ++
 examples/client/stream-tubes/accepter.c |    2 ++
 examples/client/stream-tubes/offerer.c  |    2 ++
 examples/cm/call/call-channel.c         |    2 ++
 tests/dbus/call-channel.c               |    3 +++
 6 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c
index 0f334cf..1a53e0c 100644
--- a/examples/client/dbus-tubes/accepter.c
+++ b/examples/client/dbus-tubes/accepter.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/telepathy-glib-dbus.h>
 #include "constants.h"
diff --git a/examples/client/dbus-tubes/offerer.c b/examples/client/dbus-tubes/offerer.c
index be4a287..c945e0d 100644
--- a/examples/client/dbus-tubes/offerer.c
+++ b/examples/client/dbus-tubes/offerer.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/telepathy-glib-dbus.h>
 #include "constants.h"
diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
index 8e8d5d2..7e61ba3 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/telepathy-glib-dbus.h>
 
diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
index 54e02bd..0ea601e 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/telepathy-glib-dbus.h>
 
diff --git a/examples/cm/call/call-channel.c b/examples/cm/call/call-channel.c
index 456bc49..a306155 100644
--- a/examples/cm/call/call-channel.c
+++ b/examples/cm/call/call-channel.c
@@ -34,6 +34,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include "call-channel.h"
 
 #include <string.h>
diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c
index 0b61be1..861366f 100644
--- a/tests/dbus/call-channel.c
+++ b/tests/dbus/call-channel.c
@@ -18,9 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <telepathy-glib/cli-connection.h>
 #include <telepathy-glib/cli-call.h>
 #include <telepathy-glib/cli-misc.h>
+
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/gtypes.h>



More information about the telepathy-commits mailing list