comparison src/protocols/bonjour/jabber.h @ 13902:425e0f861e88

[gaim-migrate @ 16390] A small part of sf patch #1490646, from Jonty Wareing & Jono Cole "Fix & Enhance the Bonjour prpl" "Several instances of "magic strings" have been replaced with proper XML parsing code in the Bonjour prpl, allowing it to communicate with other Gaim clients (a misplaced space in one of the strings prevented this), and every other Bonjour chat client we can find. A fair amount of completely redundant code was also stripped, which in combination with the proper XML parsing allows the client to be far more flexible about Jabber errors in other clients." committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 01 Jul 2006 22:32:20 +0000
parents 59494e5f7fdf
children 8264f52a1142
comparison
equal deleted inserted replaced
13901:e40263ba9680 13902:425e0f861e88
26 #ifndef _BONJOUR_JABBER_H_ 26 #ifndef _BONJOUR_JABBER_H_
27 #define _BONJOUR_JABBER_H_ 27 #define _BONJOUR_JABBER_H_
28 28
29 #include "account.h" 29 #include "account.h"
30 30
31 #define DOCTYPE_DECLARATION "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
32 #define STREAM_START "<stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\">"
33 #define CONVERSATION_START "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\">"
34 #define STREAM_END "</stream:stream>" 31 #define STREAM_END "</stream:stream>"
35 #define DOCTYPE "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\" >" 32 #define DOCTYPE "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<stream:stream xmlns=\"jabber:client\" xmlns:stream=\"http://etherx.jabber.org/streams\">"
36 33
37 typedef struct _BonjourJabber 34 typedef struct _BonjourJabber
38 { 35 {
39 gint port; 36 gint port;
40 gint socket; 37 gint socket;
45 typedef struct _BonjourJabberConversation 42 typedef struct _BonjourJabberConversation
46 { 43 {
47 gint socket; 44 gint socket;
48 gint watcher_id; 45 gint watcher_id;
49 gchar* buddy_name; 46 gchar* buddy_name;
50 gboolean start_step_one;
51 gboolean start_step_two;
52 gboolean stream_started; 47 gboolean stream_started;
53 gint message_id; 48 gint message_id;
54 } BonjourJabberConversation; 49 } BonjourJabberConversation;
55 50
56 /** 51 /**