[telepathy-gabble/telepathy-gabble-0.8] Send <reason><text> in session-terminate

Will Thompson will.thompson at collabora.co.uk
Mon Sep 28 14:38:26 PDT 2009


---
 src/jingle-session.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/jingle-session.c b/src/jingle-session.c
index ba33641..d76e996 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -1989,9 +1989,15 @@ gabble_jingle_session_terminate (GabbleJingleSession *sess,
           JINGLE_ACTION_SESSION_TERMINATE, &session_node);
 
       if (priv->dialect == JINGLE_DIALECT_V032 && reason_elt != NULL)
-        lm_message_node_add_child (
-            lm_message_node_add_child (session_node, "reason", NULL),
-            reason_elt, NULL);
+        {
+          LmMessageNode *r = lm_message_node_add_child (session_node, "reason",
+              NULL);
+
+          lm_message_node_add_child (r, reason_elt, NULL);
+
+          if (text != NULL && *text != '\0')
+            lm_message_node_add_child (r, "text", text);
+        }
 
       gabble_jingle_session_send (sess, msg, NULL, NULL);
     }
-- 
1.5.6.5




More information about the telepathy-commits mailing list