[Telepathy-commits] [telepathy-glib/master] _tp_channel_get_group_properties: do nothing if not a Group

[Simon McVittie]

This means that the TpChannel initialization logic no longer needs to
avoid calling this function for non-Group channels, which can lead to
simplification.
---
 telepathy-glib/channel-group.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c
index 9884c28..bf3a2a7 100644
--- a/telepathy-glib/channel-group.c
+++ b/telepathy-glib/channel-group.c
@@ -893,6 +893,16 @@ tp_channel_group_flags_changed_cb (TpChannel *self,
 void
 _tp_channel_get_group_properties (TpChannel *self)
 {
+  if (!tp_proxy_has_interface_by_id (self,
+        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
+    {
+      DEBUG ("%p: not a Group, continuing", self);
+      _tp_channel_continue_introspection (self);
+      return;
+    }
+
+  DEBUG ("%p", self);
+
   tp_cli_channel_interface_group_connect_to_members_changed (self,
       tp_channel_group_members_changed_cb, NULL, NULL, NULL, NULL);
 
-- 
1.5.6.5