From 55c45e9b080a3d1ce08f3b9bb68629334b570601 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 2 May 2012 19:32:57 +0100
Subject: [PATCH 7/9] Deprecate TpIntSet, TpIntSetIter and TpIntSetFastIter

---
 telepathy-glib/intset.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/telepathy-glib/intset.h b/telepathy-glib/intset.h
index 9ac73c0..36bf0fb 100644
--- a/telepathy-glib/intset.h
+++ b/telepathy-glib/intset.h
@@ -32,6 +32,7 @@ GType tp_intset_get_type (void);
 
 typedef struct _TpIntset TpIntset;
 
+#ifndef TP_DISABLE_DEPRECATED
 /* See fdo#30134 for the reasoning behind the rename of TpIntSet to TpIntset */
 
 /**
@@ -41,6 +42,7 @@ typedef struct _TpIntset TpIntset;
  * now just a backwards compatibility typedef.
  */
 typedef TpIntset TpIntSet;
+#endif
 
 typedef void (*TpIntFunc) (guint i, gpointer userdata);
 
@@ -83,6 +85,7 @@ typedef struct {
     guint element;
 } TpIntsetIter;
 
+#ifndef TP_DISABLE_DEPRECATED
 /**
  * TpIntSetIter: (skip)
  *
@@ -90,6 +93,7 @@ typedef struct {
  * it's now just a backwards compatibility typedef.
  */
 typedef TpIntsetIter TpIntSetIter;
+#endif
 
 #define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }
 void tp_intset_iter_init (TpIntsetIter *iter, const TpIntset *set);
@@ -101,6 +105,7 @@ typedef struct {
     gpointer _dummy[16];
 } TpIntsetFastIter;
 
+#ifndef TP_DISABLE_DEPRECATED
 /**
  * TpIntSetFastIter: (skip)
  *
@@ -108,6 +113,7 @@ typedef struct {
  * but it's now just a backwards compatibility typedef.
  */
 typedef TpIntsetFastIter TpIntSetFastIter;
+#endif
 
 void tp_intset_fast_iter_init (TpIntsetFastIter *iter,
     const TpIntset *set);
-- 
1.7.10