Use telepathy-glib's versioned deprecation warnings.

46 files changed, 67 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 98f459c0..f68c2f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,6 +212,9 @@ PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= 0.17.1])
 AC_SUBST(TELEPATHY_GLIB_CFLAGS)
 AC_SUBST(TELEPATHY_GLIB_LIBS)
 
+AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations])
+AC_DEFINE(TP_VERSION_MAX_REQUIRED, TP_VERSION_0_18, [Prevent post 0.18 APIs])
+
 dnl check the backend to use
 if test "$platform" = "win32"; then
 AC_ARG_WITH(backend,
diff --git a/plugins/test.c b/plugins/test.c
index 70e231b8..27f55ace 100644
--- a/plugins/test.c
+++ b/plugins/test.c
@@ -1,5 +1,4 @@
 #include "config.h"
-
 #include "test.h"
 
 #include <salut/plugin.h>
diff --git a/src/avahi-contact-manager.c b/src/avahi-contact-manager.c
index fd736da2..d87e359d 100644
--- a/src/avahi-contact-manager.c
+++ b/src/avahi-contact-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/avahi-contact.c b/src/avahi-contact.c
index b8e0769f..d0907e31 100644
--- a/src/avahi-contact.c
+++ b/src/avahi-contact.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/avahi-discovery-client.c b/src/avahi-discovery-client.c
index b75172ab..99f74084 100644
--- a/src/avahi-discovery-client.c
+++ b/src/avahi-discovery-client.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "avahi-discovery-client.h"
 
 #include <stdlib.h>
diff --git a/src/avahi-muc-channel.c b/src/avahi-muc-channel.c
index 738485f3..39aed36d 100644
--- a/src/avahi-muc-channel.c
+++ b/src/avahi-muc-channel.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/avahi-muc-manager.c b/src/avahi-muc-manager.c
index 46fea622..1f91c496 100644
--- a/src/avahi-muc-manager.c
+++ b/src/avahi-muc-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/avahi-olpc-activity-manager.c b/src/avahi-olpc-activity-manager.c
index 8d3691bc..8501597c 100644
--- a/src/avahi-olpc-activity-manager.c
+++ b/src/avahi-olpc-activity-manager.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/avahi-olpc-activity.c b/src/avahi-olpc-activity.c
index 424da437..a4fa26f4 100644
--- a/src/avahi-olpc-activity.c
+++ b/src/avahi-olpc-activity.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/avahi-roomlist-manager.c b/src/avahi-roomlist-manager.c
index 1ac27f78..a6de87f5 100644
--- a/src/avahi-roomlist-manager.c
+++ b/src/avahi-roomlist-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/avahi-self.c b/src/avahi-self.c
index 4b839500..350de4a1 100644
--- a/src/avahi-self.c
+++ b/src/avahi-self.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/bonjour-contact-manager.c b/src/bonjour-contact-manager.c
index a9b974a3..dd9f79b4 100644
--- a/src/bonjour-contact-manager.c
+++ b/src/bonjour-contact-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/bonjour-contact.c b/src/bonjour-contact.c
index 96285a76..077be1fc 100644
--- a/src/bonjour-contact.c
+++ b/src/bonjour-contact.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/bonjour-discovery-client.c b/src/bonjour-discovery-client.c
index fc9beaeb..bda9c9e8 100644
--- a/src/bonjour-discovery-client.c
+++ b/src/bonjour-discovery-client.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "bonjour-discovery-client.h"
 
 #include <stdlib.h>
diff --git a/src/bonjour-self.c b/src/bonjour-self.c
index d9a33908..4904880a 100644
--- a/src/bonjour-self.c
+++ b/src/bonjour-self.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c
index c01bfd9e..6b33e2a3 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-
 #include <salut/caps-channel-manager.h>
 
 #include <telepathy-glib/dbus.h>
diff --git a/src/connection-contact-info.c b/src/connection-contact-info.c
index c95a1ba9..fb0edf9f 100644
--- a/src/connection-contact-info.c
+++ b/src/connection-contact-info.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "connection-contact-info.h"
 
 #include <telepathy-glib/interfaces.h>
diff --git a/src/connection.c b/src/connection.c
index 03f745c9..c86261b4 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -17,10 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "connection.h"
 
-#include <config.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/contact.c b/src/contact.c
index 3dab6a2d..5b871ba9 100644
--- a/src/contact.c
+++ b/src/contact.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/debug.c b/src/debug.c
index ba9131d1..35a5bc23 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,4 +1,6 @@
 
+#include "config.h"
+
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/src/discovery-client.c b/src/discovery-client.c
index 8ca3f01a..7add6fa8 100644
--- a/src/discovery-client.c
+++ b/src/discovery-client.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "discovery-client.h"
 
 #include <glib.h>
diff --git a/src/dummy-discovery-client.c b/src/dummy-discovery-client.c
index 268d01c3..5399f260 100644
--- a/src/dummy-discovery-client.c
+++ b/src/dummy-discovery-client.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "dummy-discovery-client.h"
 
 #define DEBUG_FLAG DEBUG_DISCOVERY
diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c
index 9afcce8b..84031c6f 100644
--- a/src/file-transfer-channel.c
+++ b/src/file-transfer-channel.c
@@ -21,6 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <glib/gstdio.h>
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
diff --git a/src/ft-manager.c b/src/ft-manager.c
index a345d45e..82f95b3d 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/im-channel.c b/src/im-channel.c
index 957cc6d5..79e45fe9 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "im-channel.h"
 
 #include <errno.h>
diff --git a/src/im-manager.c b/src/im-manager.c
index fe5c7bca..5649f7e0 100644
--- a/src/im-manager.c
+++ b/src/im-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 38bf002f..a8773cbc 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/muc-manager.c b/src/muc-manager.c
index 5f3f24d4..7d0a22b1 100644
--- a/src/muc-manager.c
+++ b/src/muc-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/olpc-activity-manager.c b/src/olpc-activity-manager.c
index 1ee3d87e..bde30564 100644
--- a/src/olpc-activity-manager.c
+++ b/src/olpc-activity-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/olpc-activity.c b/src/olpc-activity.c
index dd2f48ae..c0c52c10 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 <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/plugin-connection.c b/src/plugin-connection.c
index 723c7642..fc36875c 100644
--- a/src/plugin-connection.c
+++ b/src/plugin-connection.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "salut/plugin-connection.h"
 
 #include <glib-object.h>
diff --git a/src/plugin-loader.c b/src/plugin-loader.c
index a54fd545..1f44a95c 100644
--- a/src/plugin-loader.c
+++ b/src/plugin-loader.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "plugin-loader.h"
 
 #include <glib.h>
diff --git a/src/plugin.c b/src/plugin.c
index 12104e55..5d8cd219 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "salut/plugin.h"
 
 #include <telepathy-glib/util.h>
diff --git a/src/protocol.c b/src/protocol.c
index 3c86551c..2b7fd87b 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,10 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "protocol.h"
 
-#include <config.h>
-
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-protocol.h>
 #include <telepathy-glib/base-connection-manager.h>
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index 2faa0f9f..3acf1ee1 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "roomlist-channel.h"
 
 #include <dbus/dbus-glib.h>
diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c
index b121917e..15151795 100644
--- a/src/roomlist-manager.c
+++ b/src/roomlist-manager.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/self.c b/src/self.c
index 8cf55112..e6cdd802 100644
--- a/src/self.c
+++ b/src/self.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/si-bytestream-manager.c b/src/si-bytestream-manager.c
index 37dd176b..e1e9c578 100644
--- a/src/si-bytestream-manager.c
+++ b/src/si-bytestream-manager.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "si-bytestream-manager.h"
 
 #include <stdio.h>
diff --git a/src/sidecar.c b/src/sidecar.c
index 481c68df..0c598d72 100644
--- a/src/sidecar.c
+++ b/src/sidecar.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "salut/sidecar.h"
 
 G_DEFINE_INTERFACE (SalutSidecar, salut_sidecar, G_TYPE_OBJECT)
diff --git a/src/text-helper.c b/src/text-helper.c
index 58dd9b30..8ace07de 100644
--- a/src/text-helper.c
+++ b/src/text-helper.c
@@ -23,6 +23,7 @@
  */
 
 #define _GNU_SOURCE /* Needed for strptime (_XOPEN_SOURCE can also be used). */
+#include "config.h"
 
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index cfa504bf..6ae4590c 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "tube-dbus.h"
 
 #include <stdlib.h>
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 18d39877..cd9200bc 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "tube-iface.h"
 
 #include <telepathy-glib/gtypes.h>
diff --git a/src/tube-stream.c b/src/tube-stream.c
index acb3a8e9..c7dd8373 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "tube-stream.h"
 
 #include <stdlib.h>
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 289eb3b3..8ce3f062 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "tubes-channel.h"
 
 #include <stdio.h>
diff --git a/src/tubes-manager.c b/src/tubes-manager.c
index 3fc6bfc7..bab7b265 100644
--- a/src/tubes-manager.c
+++ b/src/tubes-manager.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "tubes-manager.h"
 
 #include <stdlib.h>
diff --git a/src/util.c b/src/util.c
index 39a7e5e4..e9605ab9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "util.h"
 
 #include <stdlib.h>