From 4cb6a1abc3f886c006a07583b4ec1bfb82def68d Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 30 Mar 2010 19:42:48 +0100
Subject: Use _TP_GNUC_DEPRECATED for deprecated functions

---
 telepathy-glib/dbus.h  | 3 ++-
 telepathy-glib/debug.h | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index 6c743962c..0da7d6a06 100644
--- a/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
@@ -23,6 +23,7 @@
 #define __TELEPATHY_DBUS_H__
 #define __TP_IN_DBUS_H__
 
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/dbus-daemon.h>
 
 G_BEGIN_DECLS
@@ -127,7 +128,7 @@ void tp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value);
 void tp_asv_dump (GHashTable *asv);
 
 #ifndef TP_DISABLE_DEPRECATED
-DBusGProxy * tp_get_bus_proxy (void) G_GNUC_DEPRECATED;
+DBusGProxy * tp_get_bus_proxy (void) _TP_GNUC_DEPRECATED;
 #endif
 
 G_END_DECLS
diff --git a/telepathy-glib/debug.h b/telepathy-glib/debug.h
index 8bc295353..1f7a24dc6 100644
--- a/telepathy-glib/debug.h
+++ b/telepathy-glib/debug.h
@@ -2,6 +2,7 @@
 #define __TP_DEBUG_H__
 
 #include <glib.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -16,10 +17,10 @@ void tp_debug_timestamped_log_handler (const gchar *log_domain,
 
 #ifndef TP_DISABLE_DEPRECATED
 void tp_debug_set_flags_from_string (const gchar *flags_string)
-  G_GNUC_DEPRECATED;
+  _TP_GNUC_DEPRECATED;
 void tp_debug_set_flags_from_env (const gchar *var)
-  G_GNUC_DEPRECATED;
-void tp_debug_set_all_flags (void) G_GNUC_DEPRECATED;
+  _TP_GNUC_DEPRECATED;
+void tp_debug_set_all_flags (void) _TP_GNUC_DEPRECATED;
 #endif
 
 G_END_DECLS
-- 
cgit v1.2.3