[Telepathy-commits] [telepathy-gabble/master] Have create_session() return a GError; for the moment, assert that it always succeeds

[Simon McVittie]

20080430151243-53eee-c1d749f549a7757522d0232a6a70163a0eeba738.gz
---
 src/gabble-media-channel.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/gabble-media-channel.c b/src/gabble-media-channel.c
index 59d0539..55ebedf 100644
--- a/src/gabble-media-channel.c
+++ b/src/gabble-media-channel.c
@@ -223,7 +223,8 @@ static GabbleMediaSession *
 create_session (GabbleMediaChannel *channel,
                 TpHandle peer,
                 const gchar *peer_resource,
-                const gchar *sid)
+                const gchar *sid,
+                GError **error)
 {
   GabbleMediaChannelPrivate *priv;
   GabbleMediaSession *session;
@@ -297,7 +298,8 @@ _gabble_media_channel_dispatch_session_action (GabbleMediaChannel *chan,
       TpGroupMixin *mixin = TP_GROUP_MIXIN (chan);
       TpIntSet *set;
 
-      session = create_session (chan, peer, peer_resource, sid);
+      session = create_session (chan, peer, peer_resource, sid, NULL);
+      g_assert (session != NULL);
       session_is_new = TRUE;
 
       /* make us local pending */
@@ -1089,7 +1091,8 @@ _gabble_media_channel_add_member (GObject *obj,
       /* yes: invite the peer */
 
       /* create a new session */
-      create_session (chan, handle, NULL, NULL);
+      create_session (chan, handle, NULL, NULL, NULL);
+      g_assert (priv->session != NULL);
 
       /* make the peer remote pending */
       set = tp_intset_new ();
-- 
1.5.6.3