[Telepathy-commits] [telepathy-glib/master] Don't deprecate create_channel_factories and TpChannelFactoryIface

[Will Thompson]

---
 telepathy-glib/base-connection.h       |    4 ++--
 telepathy-glib/channel-factory-iface.c |   11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 9e58009..19fbb37 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -143,8 +143,8 @@ typedef gchar *(*TpBaseConnectionGetUniqueConnectionNameImpl) (
  *  at least a CONTACT handle repository (failing to do so will cause a crash).
  * @create_channel_factories: Create an array of channel factories for this
  *  Connection. At least one of this or @create_channel_managers must be set by
- *  subclasses to a non-%NULL value; this method is deprecated in favour of
- *  @create_channel_managers since 0.7.UNRELEASED.
+ *  subclasses to a non-%NULL value; in new code, setting this to %NULL and
+ *  using channel managers exclusively is recommended.
  * @get_unique_connection_name: Construct a unique name for this connection
  *  (for example using the protocol's format for usernames). If %NULL (the
  *  default), a unique name will be generated. Subclasses should usually
diff --git a/telepathy-glib/channel-factory-iface.c b/telepathy-glib/channel-factory-iface.c
index e2dcde6..a2eb095 100644
--- a/telepathy-glib/channel-factory-iface.c
+++ b/telepathy-glib/channel-factory-iface.c
@@ -34,12 +34,11 @@
  * all requests and all incoming events, but in general, there will be
  * multiple channel factories handling different types of channel.
  *
- * @deprecated since 0.7.UNRELEASED. #TpChannelManager is a newer interface for
- *             allocating and tracking channels which supports the Requests
- *             D-Bus interface introduced in version 0.17.11 of the
- *             specification.  New connection managers should implement that
- *             interface instead, and existing connection managers should
- *             migrate to it.
+ * #TpChannelManager is a newer interface (introduced in telepathy-glib
+ * 0.7.UNRELEASED) for allocating and tracking channels which supports the
+ * Requests D-Bus interface introduced in version 0.17.11 of the
+ * specification.  New connection managers should implement that interface
+ * instead, and existing connection managers should migrate to it.
  */
 
 #include <telepathy-glib/channel-factory-iface.h>
-- 
1.5.6.5