[Telepathy-commits] [telepathy-gabble/master] jingle code: comment improvements, added missing forward declaration

[Senko Rasic]

---
 src/jingle-factory.c |    2 +-
 src/jingle-session.c |    9 +++++----
 src/media-stream.c   |    1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index 55416fe..26864e3 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -321,7 +321,7 @@ gabble_jingle_factory_constructor (GType type,
   self = GABBLE_JINGLE_FACTORY (obj);
   priv = GABBLE_JINGLE_FACTORY_GET_PRIVATE (self);
 
-  // FIXME: why was this in _constructed in media factory?
+  /* FIXME: why was this in _constructed in media factory? */
   g_signal_connect (priv->conn,
       "status-changed", (GCallback) connection_status_changed_cb, self);
 
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 08867b2..c047bbf 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -121,6 +121,8 @@ static JingleAction allowed_actions[MAX_JINGLE_STATES][MAX_ACTIONS_PER_STATE] =
   { JINGLE_ACTION_UNKNOWN }
 };
 
+static gboolean _terminate_delayed (gpointer user_data);
+
 static void
 gabble_jingle_session_init (GabbleJingleSession *obj)
 {
@@ -837,11 +839,10 @@ on_transport_info (GabbleJingleSession *sess, LmMessageNode *node,
 
   if (JINGLE_IS_GOOGLE_DIALECT (priv->dialect))
     {
-      /* GTalk has only one content anyways */
+      /* We are certain that GTalk has only one content. It's not possible
+       * for session to have more than one content if in gtalk mode (if
+       * it happens, it's a bug in our code). */
       GList *cs = g_hash_table_get_values (priv->contents);
-
-      /* Check that's the case */
-      /* FIXME: report error to peer instead of assert */
       g_assert (g_list_length (cs) == 1);
 
       c = cs->data;
diff --git a/src/media-stream.c b/src/media-stream.c
index 506d4be..e65caa3 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -1285,7 +1285,6 @@ content_senders_changed_cb (GabbleJingleContent *c,
                             GParamSpec *pspec,
                             GabbleMediaStream *stream)
 {
-  // GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (stream);
   JingleContentSenders senders;
 
   g_object_get (c, "senders", &senders, NULL);
-- 
1.5.6.5