[Telepathy-commits] [telepathy-gabble/master] In _gabble_media_channel_dispatch_session_action, assert that we're not about to cause create_session() to get confused

[Simon McVittie]

20080430151318-53eee-bd593255b5a8aed05860daf707a890cd1de3ecd7.gz
---
 src/gabble-media-channel.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/gabble-media-channel.c b/src/gabble-media-channel.c
index 55ebedf..453e3b1 100644
--- a/src/gabble-media-channel.c
+++ b/src/gabble-media-channel.c
@@ -293,6 +293,10 @@ _gabble_media_channel_dispatch_session_action (GabbleMediaChannel *chan,
   GabbleMediaSession *session = priv->session;
   gboolean session_is_new = FALSE;
 
+  /* If this assertion fails, create_session() would think we're the
+   * initiator. However, GabbleMediaFactory checks this, so it can't fail */
+  g_return_val_if_fail (sid != NULL, FALSE);
+
   if (session == NULL)
     {
       TpGroupMixin *mixin = TP_GROUP_MIXIN (chan);
-- 
1.5.6.3