changeset 26283:abcc94ace5ea

Update to be closer to the current Jingle XEP.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 17 Mar 2009 02:48:43 +0000
parents 583d211a956a
children 4f47eeaa1414
files libpurple/protocols/jabber/jingle/jingle.c libpurple/protocols/jabber/jingle/jingle.h
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/jingle.c	Tue Mar 17 02:19:10 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c	Tue Mar 17 02:48:43 2009 +0000
@@ -177,6 +177,12 @@
 }
 
 static void
+jingle_handle_security_info(JingleSession *session, xmlnode *jingle)
+{
+	jabber_iq_send(jingle_session_create_ack(session, jingle));
+}
+
+static void
 jingle_handle_session_accept(JingleSession *session, xmlnode *jingle)
 {
 	xmlnode *content = xmlnode_get_child(jingle, "content");
@@ -321,6 +327,7 @@
 	{"content-reject",	jingle_handle_content_reject},
 	{"content-remove",	jingle_handle_content_remove},
 	{"description-info",	jingle_handle_description_info},
+	{"security-info",	jingle_handle_security_info},
 	{"session-accept",	jingle_handle_session_accept},
 	{"session-info",	jingle_handle_session_info},
 	{"session-initiate",	jingle_handle_session_initiate},
--- a/libpurple/protocols/jabber/jingle/jingle.h	Tue Mar 17 02:19:10 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.h	Tue Mar 17 02:48:43 2009 +0000
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#define JINGLE "urn:xmpp:jingle:0"
+#define JINGLE "urn:xmpp:jingle:1"
 #define JINGLE_ERROR "urn:xmpp:jingle:errors:0"
 #define JINGLE_APP_FT "urn:xmpp:jingle:apps:file-transfer:1"
 #define JINGLE_APP_RTP "urn:xmpp:jingle:apps:rtp:1"
@@ -53,6 +53,7 @@
 	JINGLE_CONTENT_REJECT,
 	JINGLE_CONTENT_REMOVE,
 	JINGLE_DESCRIPTION_INFO,
+	JINGLE_SECURITY_INFO,
 	JINGLE_SESSION_ACCEPT,
 	JINGLE_SESSION_INFO,
 	JINGLE_SESSION_INITIATE,