summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac1
-rw-r--r--plugins/console.c4
-rw-r--r--plugins/test.c3
-rw-r--r--src/base-call-channel.c1
-rw-r--r--src/call-channel.c1
-rw-r--r--src/call-content.c2
-rw-r--r--src/call-member-content.c1
-rw-r--r--src/call-muc-channel.c1
-rw-r--r--src/media-channel-hold.c2
-rw-r--r--src/message-util.c2
-rw-r--r--src/muc-tube-dbus.c2
-rw-r--r--src/muc-tube-stream.c2
-rw-r--r--src/olpc-activity.c2
-rw-r--r--src/plugin-connection.c2
-rw-r--r--src/plugin-loader.c2
-rw-r--r--src/plugin.c2
-rw-r--r--src/protocol.c2
-rw-r--r--src/room-config.c2
18 files changed, 31 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 12303e2b2..264923279 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,6 +296,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.1.0, dbus-glib-1 >= 0.82])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations])
PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.19.0])
AC_SUBST(TP_GLIB_CFLAGS)
diff --git a/plugins/console.c b/plugins/console.c
index 69dd1e1e3..8ec2894ac 100644
--- a/plugins/console.c
+++ b/plugins/console.c
@@ -17,10 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "console.h"
-
#include "config.h"
+#include "console.h"
+
#include <string.h>
#include <telepathy-glib/telepathy-glib.h>
diff --git a/plugins/test.c b/plugins/test.c
index 92c08335d..bb6b71959 100644
--- a/plugins/test.c
+++ b/plugins/test.c
@@ -1,6 +1,7 @@
-#include "test.h"
#include "config.h"
+#include "test.h"
+
#include <stdio.h>
#include <telepathy-glib/telepathy-glib.h>
diff --git a/src/base-call-channel.c b/src/base-call-channel.c
index 321e3da4d..5ea79b27b 100644
--- a/src/base-call-channel.c
+++ b/src/base-call-channel.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-channel.c b/src/call-channel.c
index f51454f21..b2cd814ac 100644
--- a/src/call-channel.c
+++ b/src/call-channel.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-content.c b/src/call-content.c
index 8ca94be97..8550b82fc 100644
--- a/src/call-content.c
+++ b/src/call-content.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-member-content.c b/src/call-member-content.c
index 7d9f099aa..8899b0f58 100644
--- a/src/call-member-content.c
+++ b/src/call-member-content.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c
index 75d2b1ba1..4733dfb81 100644
--- a/src/call-muc-channel.c
+++ b/src/call-muc-channel.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/media-channel-hold.c b/src/media-channel-hold.c
index 646ab93a4..ebd1cf2a3 100644
--- a/src/media-channel-hold.c
+++ b/src/media-channel-hold.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "media-channel.h"
#include "media-channel-internal.h"
diff --git a/src/message-util.c b/src/message-util.c
index a272a177e..008bbe513 100644
--- a/src/message-util.c
+++ b/src/message-util.c
@@ -22,6 +22,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "message-util.h"
#include <string.h>
diff --git a/src/muc-tube-dbus.c b/src/muc-tube-dbus.c
index 5ed1eefd6..7c37e9edb 100644
--- a/src/muc-tube-dbus.c
+++ b/src/muc-tube-dbus.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "muc-tube-dbus.h"
G_DEFINE_TYPE (GabbleMucTubeDBus, gabble_muc_tube_dbus,
diff --git a/src/muc-tube-stream.c b/src/muc-tube-stream.c
index ad173fed9..a50a94a69 100644
--- a/src/muc-tube-stream.c
+++ b/src/muc-tube-stream.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "muc-tube-stream.h"
G_DEFINE_TYPE (GabbleMucTubeStream, gabble_muc_tube_stream,
diff --git a/src/olpc-activity.c b/src/olpc-activity.c
index 86df324e8..a5f34a581 100644
--- a/src/olpc-activity.c
+++ b/src/olpc-activity.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "olpc-activity.h"
#include <stdlib.h>
diff --git a/src/plugin-connection.c b/src/plugin-connection.c
index abec9e404..0d0d95e9f 100644
--- a/src/plugin-connection.c
+++ b/src/plugin-connection.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "gabble/plugin-connection.h"
#include <glib-object.h>
diff --git a/src/plugin-loader.c b/src/plugin-loader.c
index f08087e46..56acda0e6 100644
--- a/src/plugin-loader.c
+++ b/src/plugin-loader.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "plugin-loader.h"
#include <glib.h>
diff --git a/src/plugin.c b/src/plugin.c
index a96bb91f9..f5c26427e 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "gabble/plugin.h"
#include <telepathy-glib/errors.h>
diff --git a/src/protocol.c b/src/protocol.c
index 144521993..eb054e15e 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "protocol.h"
#include <string.h>
diff --git a/src/room-config.c b/src/room-config.c
index 6345fc767..199545ad5 100644
--- a/src/room-config.c
+++ b/src/room-config.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "room-config.h"
#include "muc-channel.h"
View Lorry Controller Status