pidgin.vv: 24451793: Update to be closer to the current Jingl...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 24451793eefe89a0ce1a97de546721121cd37cb4
Ancestor: 4b3aaac17c64775093287ac5c8b4eaf21183f078
Author: maiku at soc.pidgin.im
Date: 2009-03-17T02:48:43
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/24451793eefe89a0ce1a97de546721121cd37cb4

Modified files:
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h

ChangeLog: 

Update to be closer to the current Jingle XEP.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/jingle.c	86d24dabe5c8fe2d1127b6c8687ee61daf646e7d
+++ libpurple/protocols/jabber/jingle/jingle.c	9f99f8696d91de320cecfb10008f24a1fcd4df29
@@ -177,6 +177,12 @@ static void
 }
 
 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 @@ static const JingleAction jingle_actions
 	{"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},
============================================================
--- libpurple/protocols/jabber/jingle/jingle.h	fd797e5eb954cf605877c5d8446c4513aa847d00
+++ libpurple/protocols/jabber/jingle/jingle.h	e52f8275df4cb5394acdb0a469a7878de152bb70
@@ -30,7 +30,7 @@ extern "C" {
 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 @@ typedef enum {
 	JINGLE_CONTENT_REJECT,
 	JINGLE_CONTENT_REMOVE,
 	JINGLE_DESCRIPTION_INFO,
+	JINGLE_SECURITY_INFO,
 	JINGLE_SESSION_ACCEPT,
 	JINGLE_SESSION_INFO,
 	JINGLE_SESSION_INITIATE,