[Telepathy-commits] [telepathy-mission-control/master] Remove conflicting macro

[Alberto Mardegan]

The new tp-glib defines this macro and function, we can remove it from here.
---
 src/mcd-misc.c |   10 ----------
 src/mcd-misc.h |    9 ---------
 2 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/src/mcd-misc.c b/src/mcd-misc.c
index b6b042f..177fec3 100644
--- a/src/mcd-misc.c
+++ b/src/mcd-misc.c
@@ -171,16 +171,6 @@ _mcd_get_error_string (const GError *error)
 }
 
 GType
-type_dbus_aasv (void)
-{
-  static GType t = 0;
-
-  if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_collection ("GPtrArray", tp_type_dbus_hash_sv ());
-  return t;
-}
-
-GType
 _mcd_type_dbus_ao (void)
 {
   static GType t = 0;
diff --git a/src/mcd-misc.h b/src/mcd-misc.h
index f63b294..bbdc4b7 100644
--- a/src/mcd-misc.h
+++ b/src/mcd-misc.h
@@ -43,15 +43,6 @@ GHashTable *_mcd_deepcopy_asv (GHashTable *asv);
 
 const gchar *_mcd_get_error_string (const GError *error);
 
-/* FIXME: we should use the definition from telepathy-glib, but
- * https://bugs.freedesktop.org/show_bug.cgi?id=18515
- * TP_ARRAY_TYPE_CHANNEL_CLASS_LIST is not defined at the moment */
-#ifdef TP_ARRAY_TYPE_CHANNEL_CLASS_LIST
-#error "telepathy-glib has been fixed, this should be removed"
-#endif
-#define TP_ARRAY_TYPE_CHANNEL_CLASS_LIST (type_dbus_aasv ())
-GType type_dbus_aasv (void);
-
 typedef void (*McdReadyCb) (gpointer object, const GError *error,
                             gpointer user_data);
 void mcd_object_call_when_ready (gpointer object, GQuark quark,
-- 
1.5.6.5