summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-11-16 14:22:25 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-11-16 14:22:25 +0000
commitfe20aeaba0f70553039c5e114e466fdfac5226c8 (patch)
tree76815ac95252bab39791ca3eb3140e06ca001fe8
parenta73b0c13faaab99927c44bebac7088d5c24ba6ea (diff)
Revert "Use telepathy-glib's versioned deprecation warnings."
-rw-r--r--configure.ac3
-rw-r--r--plugins/test.c1
-rw-r--r--src/avahi-contact-manager.c2
-rw-r--r--src/avahi-contact.c2
-rw-r--r--src/avahi-discovery-client.c1
-rw-r--r--src/avahi-muc-channel.c2
-rw-r--r--src/avahi-muc-manager.c2
-rw-r--r--src/avahi-olpc-activity-manager.c2
-rw-r--r--src/avahi-olpc-activity.c2
-rw-r--r--src/avahi-roomlist-manager.c2
-rw-r--r--src/avahi-self.c2
-rw-r--r--src/bonjour-contact-manager.c2
-rw-r--r--src/bonjour-contact.c2
-rw-r--r--src/bonjour-discovery-client.c1
-rw-r--r--src/bonjour-self.c2
-rw-r--r--src/caps-channel-manager.c1
-rw-r--r--src/connection-contact-info.c1
-rw-r--r--src/connection.c3
-rw-r--r--src/contact.c2
-rw-r--r--src/debug.c2
-rw-r--r--src/discovery-client.c1
-rw-r--r--src/dummy-discovery-client.c1
-rw-r--r--src/file-transfer-channel.c2
-rw-r--r--src/ft-manager.c2
-rw-r--r--src/im-channel.c1
-rw-r--r--src/im-manager.c2
-rw-r--r--src/muc-channel.c2
-rw-r--r--src/muc-manager.c2
-rw-r--r--src/olpc-activity-manager.c2
-rw-r--r--src/olpc-activity.c2
-rw-r--r--src/plugin-connection.c1
-rw-r--r--src/plugin-loader.c1
-rw-r--r--src/plugin.c1
-rw-r--r--src/protocol.c3
-rw-r--r--src/roomlist-channel.c1
-rw-r--r--src/roomlist-manager.c2
-rw-r--r--src/self.c2
-rw-r--r--src/si-bytestream-manager.c1
-rw-r--r--src/sidecar.c1
-rw-r--r--src/text-helper.c1
-rw-r--r--src/tube-dbus.c1
-rw-r--r--src/tube-iface.c1
-rw-r--r--src/tube-stream.c1
-rw-r--r--src/tubes-channel.c1
-rw-r--r--src/tubes-manager.c1
-rw-r--r--src/util.c1
46 files changed, 7 insertions, 67 deletions
diff --git a/configure.ac b/configure.ac
index f68c2f1d..98f459c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,9 +212,6 @@ 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 27f55ace..70e231b8 100644
--- a/plugins/test.c
+++ b/plugins/test.c
@@ -1,4 +1,5 @@
#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 d87e359d..fd736da2 100644
--- a/src/avahi-contact-manager.c
+++ b/src/avahi-contact-manager.c
@@ -17,8 +17,6 @@
* 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 d0907e31..b8e0769f 100644
--- a/src/avahi-contact.c
+++ b/src/avahi-contact.c
@@ -17,8 +17,6 @@
* 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 99f74084..b75172ab 100644
--- a/src/avahi-discovery-client.c
+++ b/src/avahi-discovery-client.c
@@ -17,7 +17,6 @@
* 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 39aed36d..738485f3 100644
--- a/src/avahi-muc-channel.c
+++ b/src/avahi-muc-channel.c
@@ -17,8 +17,6 @@
* 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 1f91c496..46fea622 100644
--- a/src/avahi-muc-manager.c
+++ b/src/avahi-muc-manager.c
@@ -17,8 +17,6 @@
* 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 8501597c..8d3691bc 100644
--- a/src/avahi-olpc-activity-manager.c
+++ b/src/avahi-olpc-activity-manager.c
@@ -18,8 +18,6 @@
* 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 a4fa26f4..424da437 100644
--- a/src/avahi-olpc-activity.c
+++ b/src/avahi-olpc-activity.c
@@ -17,8 +17,6 @@
* 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 a6de87f5..1ac27f78 100644
--- a/src/avahi-roomlist-manager.c
+++ b/src/avahi-roomlist-manager.c
@@ -17,8 +17,6 @@
* 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 350de4a1..4b839500 100644
--- a/src/avahi-self.c
+++ b/src/avahi-self.c
@@ -17,8 +17,6 @@
* 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 dd9f79b4..a9b974a3 100644
--- a/src/bonjour-contact-manager.c
+++ b/src/bonjour-contact-manager.c
@@ -17,8 +17,6 @@
* 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 077be1fc..96285a76 100644
--- a/src/bonjour-contact.c
+++ b/src/bonjour-contact.c
@@ -17,8 +17,6 @@
* 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 bda9c9e8..fc9beaeb 100644
--- a/src/bonjour-discovery-client.c
+++ b/src/bonjour-discovery-client.c
@@ -17,7 +17,6 @@
* 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 4904880a..d9a33908 100644
--- a/src/bonjour-self.c
+++ b/src/bonjour-self.c
@@ -17,8 +17,6 @@
* 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 6b33e2a3..c01bfd9e 100644
--- a/src/caps-channel-manager.c
+++ b/src/caps-channel-manager.c
@@ -21,6 +21,7 @@
*/
#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 fb0edf9f..c95a1ba9 100644
--- a/src/connection-contact-info.c
+++ b/src/connection-contact-info.c
@@ -17,7 +17,6 @@
* 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 c86261b4..03f745c9 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -17,9 +17,10 @@
* 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 5b871ba9..3dab6a2d 100644
--- a/src/contact.c
+++ b/src/contact.c
@@ -17,8 +17,6 @@
* 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 35a5bc23..ba9131d1 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,6 +1,4 @@
-#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 7add6fa8..8ca3f01a 100644
--- a/src/discovery-client.c
+++ b/src/discovery-client.c
@@ -17,7 +17,6 @@
* 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 5399f260..268d01c3 100644
--- a/src/dummy-discovery-client.c
+++ b/src/dummy-discovery-client.c
@@ -17,7 +17,6 @@
* 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 84031c6f..9afcce8b 100644
--- a/src/file-transfer-channel.c
+++ b/src/file-transfer-channel.c
@@ -21,8 +21,6 @@
* 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 82f95b3d..a345d45e 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -19,8 +19,6 @@
* 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 79e45fe9..957cc6d5 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -18,7 +18,6 @@
* 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 5649f7e0..fe5c7bca 100644
--- a/src/im-manager.c
+++ b/src/im-manager.c
@@ -17,8 +17,6 @@
* 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 a8773cbc..38bf002f 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -18,8 +18,6 @@
* 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 7d0a22b1..5f3f24d4 100644
--- a/src/muc-manager.c
+++ b/src/muc-manager.c
@@ -17,8 +17,6 @@
* 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 bde30564..1ee3d87e 100644
--- a/src/olpc-activity-manager.c
+++ b/src/olpc-activity-manager.c
@@ -17,8 +17,6 @@
* 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 c0c52c10..dd2f48ae 100644
--- a/src/olpc-activity.c
+++ b/src/olpc-activity.c
@@ -17,8 +17,6 @@
* 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 fc36875c..723c7642 100644
--- a/src/plugin-connection.c
+++ b/src/plugin-connection.c
@@ -17,7 +17,6 @@
* 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 1f44a95c..a54fd545 100644
--- a/src/plugin-loader.c
+++ b/src/plugin-loader.c
@@ -19,6 +19,7 @@
*/
#include "config.h"
+
#include "plugin-loader.h"
#include <glib.h>
diff --git a/src/plugin.c b/src/plugin.c
index 5d8cd219..12104e55 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -18,7 +18,6 @@
* 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 2b7fd87b..3c86551c 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,9 +17,10 @@
* 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 3acf1ee1..2faa0f9f 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -17,7 +17,6 @@
* 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 15151795..b121917e 100644
--- a/src/roomlist-manager.c
+++ b/src/roomlist-manager.c
@@ -17,8 +17,6 @@
* 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 e6cdd802..8cf55112 100644
--- a/src/self.c
+++ b/src/self.c
@@ -17,8 +17,6 @@
* 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 e1e9c578..37dd176b 100644
--- a/src/si-bytestream-manager.c
+++ b/src/si-bytestream-manager.c
@@ -17,7 +17,6 @@
* 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 0c598d72..481c68df 100644
--- a/src/sidecar.c
+++ b/src/sidecar.c
@@ -18,7 +18,6 @@
* 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 8ace07de..58dd9b30 100644
--- a/src/text-helper.c
+++ b/src/text-helper.c
@@ -23,7 +23,6 @@
*/
#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 6ae4590c..cfa504bf 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -17,7 +17,6 @@
* 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 cd9200bc..18d39877 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -17,7 +17,6 @@
* 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 c7dd8373..acb3a8e9 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -17,7 +17,6 @@
* 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 8ce3f062..289eb3b3 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -17,7 +17,6 @@
* 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 bab7b265..3fc6bfc7 100644
--- a/src/tubes-manager.c
+++ b/src/tubes-manager.c
@@ -17,7 +17,6 @@
* 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 e9605ab9..39a7e5e4 100644
--- a/src/util.c
+++ b/src/util.c
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
#include "util.h"
#include <stdlib.h>