[Telepathy-commits] [telepathy-glib/master] Add sanity checks to tp_channel_group_*

[Xavier Claessens]

---
 telepathy-glib/channel-group.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c
index e83d98d..9c3c7f6 100644
--- a/telepathy-glib/channel-group.c
+++ b/telepathy-glib/channel-group.c
@@ -78,6 +78,8 @@ local_pending_info_free (LocalPendingInfo *info)
 TpHandle
 tp_channel_group_get_self_handle (TpChannel *self)
 {
+  g_return_val_if_fail (TP_IS_CHANNEL (self), 0);
+
   return self->priv->group_self_handle;
 }
 
@@ -95,6 +97,8 @@ tp_channel_group_get_self_handle (TpChannel *self)
 TpChannelGroupFlags
 tp_channel_group_get_flags (TpChannel *self)
 {
+  g_return_val_if_fail (TP_IS_CHANNEL (self), 0);
+
   return self->priv->group_flags;
 }
 
@@ -117,6 +121,8 @@ tp_channel_group_get_flags (TpChannel *self)
 const TpIntSet *
 tp_channel_group_get_members (TpChannel *self)
 {
+  g_return_val_if_fail (TP_IS_CHANNEL (self), NULL);
+
   return self->priv->group_members;
 }
 
@@ -139,6 +145,8 @@ tp_channel_group_get_members (TpChannel *self)
 const TpIntSet *
 tp_channel_group_get_local_pending (TpChannel *self)
 {
+  g_return_val_if_fail (TP_IS_CHANNEL (self), NULL);
+
   return self->priv->group_local_pending;
 }
 
@@ -161,6 +169,8 @@ tp_channel_group_get_local_pending (TpChannel *self)
 const TpIntSet *
 tp_channel_group_get_remote_pending (TpChannel *self)
 {
+  g_return_val_if_fail (TP_IS_CHANNEL (self), NULL);
+
   return self->priv->group_remote_pending;
 }
 
@@ -199,6 +209,8 @@ tp_channel_group_get_local_pending_info (TpChannel *self,
   TpChannelGroupChangeReason r = TP_CHANNEL_GROUP_CHANGE_REASON_NONE;
   const gchar *m = "";
 
+  g_return_val_if_fail (TP_IS_CHANNEL (self), FALSE);
+
   if (self->priv->group_local_pending != NULL)
     {
       /* it could conceivably be someone who is local-pending */
@@ -288,6 +300,8 @@ tp_channel_group_get_handle_owner (TpChannel *self,
 {
   gpointer key, value;
 
+  g_return_val_if_fail (TP_IS_CHANNEL (self), 0);
+
   if (self->priv->group_handle_owners == NULL)
     {
       /* undefined result - pretending it's global is probably as good as
-- 
1.5.6.5