[next] telepathy-glib: Move tp_channel_get_target/ initiator_contact to channel.c

[Xavier Claessens]

Module: telepathy-glib
Branch: next
Commit: bffeefaf46dcf9b5b1d10180aeb7b38aaa2e716d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=bffeefaf46dcf9b5b1d10180aeb7b38aaa2e716d

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Thu May  3 20:58:42 2012 +0200

Move tp_channel_get_target/initiator_contact to channel.c

Keep channel-contacts.c for GROUP interface

---

 telepathy-glib/channel-contacts.c |   34 ----------------------------------
 telepathy-glib/channel.c          |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/telepathy-glib/channel-contacts.c b/telepathy-glib/channel-contacts.c
index 178a222..cc8562b 100644
--- a/telepathy-glib/channel-contacts.c
+++ b/telepathy-glib/channel-contacts.c
@@ -737,40 +737,6 @@ _tp_channel_contacts_self_contact_changed (TpChannel *self,
 }
 
 /**
- * tp_channel_get_target_contact:
- * @self: a channel
- *
- * <!-- -->
- *
- * Returns: (transfer none): the value of #TpChannel:target-contact
- * Since: 0.15.6
- */
-TpContact *
-tp_channel_get_target_contact (TpChannel *self)
-{
-  g_return_val_if_fail (TP_IS_CHANNEL (self), NULL);
-
-  return self->priv->target_contact;
-}
-
-/**
- * tp_channel_get_initiator_contact:
- * @self: a channel
- *
- * <!-- -->
- *
- * Returns: (transfer none): the value of #TpChannel:initiator-contact
- * Since: 0.15.6
- */
-TpContact *
-tp_channel_get_initiator_contact (TpChannel *self)
-{
-  g_return_val_if_fail (TP_IS_CHANNEL (self), NULL);
-
-  return self->priv->initiator_contact;
-}
-
-/**
  * tp_channel_group_get_self_contact:
  * @self: a channel
  *
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 17eb947..b958b84 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -387,6 +387,39 @@ tp_channel_borrow_immutable_properties (TpChannel *self)
   return self->priv->channel_properties;
 }
 
+/**
+ * tp_channel_get_target_contact:
+ * @self: a channel
+ *
+ * <!-- -->
+ *
+ * Returns: (transfer none): the value of #TpChannel:target-contact
+ * Since: 0.15.6
+ */
+TpContact *
+tp_channel_get_target_contact (TpChannel *self)
+{
+  g_return_val_if_fail (TP_IS_CHANNEL (self), NULL);
+
+  return self->priv->target_contact;
+}
+
+/**
+ * tp_channel_get_initiator_contact:
+ * @self: a channel
+ *
+ * <!-- -->
+ *
+ * Returns: (transfer none): the value of #TpChannel:initiator-contact
+ * Since: 0.15.6
+ */
+TpContact *
+tp_channel_get_initiator_contact (TpChannel *self)
+{
+  g_return_val_if_fail (TP_IS_CHANNEL (self), NULL);
+
+  return self->priv->initiator_contact;
+}
 
 static void
 tp_channel_get_property (GObject *object,