Revision 20a1ba72d00c9f9c028323b31adfea0311e51c6f

[markdoliner at pidgin.im]

o   -----------------------------------------------------------------
|   Revision: 20a1ba72d00c9f9c028323b31adfea0311e51c6f
|   Ancestor: 6bdb4b08d8cf550a680167ec1a1206c66120f273
|   Author: markdoliner at pidgin.im
|   Date: 2007-03-25T06:24:04
|   Branch: im.pidgin.pidgin
|   
|   Modified files:
|           libpurple/protocols/jabber/jabber.c
|           libpurple/protocols/oscar/oscar_data.c libpurple/xmlnode.c
|   
|   ChangeLog: 
|   
|   Don't advertise that we support the adverts, invite and translate
|   families for oscar.  This makes us a little easier to identify...
|   but I don't believe AOL will come after us.
|   
|   ============================================================
|   --- libpurple/protocols/jabber/jabber.c	141364b1f879c0a2c87215693729c9c3da54a339
|   +++ libpurple/protocols/jabber/jabber.c	c4cd9ad987f68c49faa0a87362a22cefa437ecc5
|   @@ -162,6 +162,7 @@ static void jabber_stream_handle_error(J
|    static void jabber_stream_handle_error(JabberStream *js, xmlnode *packet)
|    {
|    	char *msg = jabber_parse_error(js, packet);
|   +purple_debug_error("MARK", "in jabber_stream_handle_error\n");
|    
|    	purple_connection_error(js->gc, msg);
|    	g_free(msg);
|   @@ -1453,6 +1454,7 @@ char *jabber_parse_error(JabberStream *j
|    	const char *code = NULL, *text = NULL;
|    	const char *xmlns = xmlnode_get_namespace(packet);
|    	char *cdata = NULL;
|   +purple_debug_error("MARK", "in jabber_parse_error, packet->name=%s, xmlns=%s, type=%d, data=%s\n", packet->name, packet->xmlns, packet->type, packet->data);
|    
|    	if((error = xmlnode_get_child(packet, "error"))) {
|    		cdata = xmlnode_get_data(error);
|   @@ -1529,11 +1531,13 @@ char *jabber_parse_error(JabberStream *j
|    			text = _("Authentication Failure");
|    		}
|    	} else if(!strcmp(packet->name, "stream:error")) {
|   +purple_debug_error("MARK", "stream:error\n");
|    		if(xmlnode_get_child(packet, "bad-format")) {
|    			text = _("Bad Format");
|    		} else if(xmlnode_get_child(packet, "bad-namespace-prefix")) {
|    			text = _("Bad Namespace Prefix");
|    		} else if(xmlnode_get_child(packet, "conflict")) {
|   +purple_debug_error("MARK", "conflict\n");
|    			js->gc->wants_to_die = TRUE;
|    			text = _("Resource Conflict");
|    		} else if(xmlnode_get_child(packet, "connection-timeout")) {
|   @@ -1583,6 +1587,7 @@ char *jabber_parse_error(JabberStream *j
|    		}
|    	}
|    
|   +purple_debug_error("MARK", "text=\n", text);
|    	if(text || cdata) {
|    		char *ret = g_strdup_printf("%s%s%s", code ? code : "",
|    				code ? ": " : "", text ? text : cdata);
|   ============================================================
|   --- libpurple/protocols/oscar/oscar_data.c	f9feb20079aabe956491f9f5b1a2220b3f0c1de0
|   +++ libpurple/protocols/oscar/oscar_data.c	be535a60ad5b894fbc6de98f4d3e3e593656d22e
|   @@ -53,14 +53,14 @@ oscar_data_new(void)
|    	aim__registermodule(od, locate_modfirst);
|    	aim__registermodule(od, buddylist_modfirst);
|    	aim__registermodule(od, msg_modfirst);
|   -	aim__registermodule(od, adverts_modfirst);
|   -	aim__registermodule(od, invite_modfirst);
|   +	/* aim__registermodule(od, adverts_modfirst); */
|   +	/* aim__registermodule(od, invite_modfirst); */
|    	aim__registermodule(od, admin_modfirst);
|    	aim__registermodule(od, popups_modfirst);
|    	aim__registermodule(od, bos_modfirst);
|    	aim__registermodule(od, search_modfirst);
|    	aim__registermodule(od, stats_modfirst);
|   -	aim__registermodule(od, translate_modfirst);
|   +	/* aim__registermodule(od, translate_modfirst); */
|    	aim__registermodule(od, chatnav_modfirst);
|    	aim__registermodule(od, chat_modfirst);
|    	aim__registermodule(od, odir_modfirst);
|   ============================================================
|   --- libpurple/xmlnode.c	0d311b8a651fde5d754e47a6b55351da76093197
|   +++ libpurple/xmlnode.c	c52baf74d09cca1ded4d62334c25717cd4f2bacd
|   @@ -27,6 +27,7 @@
|     * write my own stuff.  Also, re-writing this lets me be as lightweight
|     * as I want to be.  Thank you libxode for giving me a good starting point */
|    
|   +#include "debug.h"
|    #include "internal.h"
|    
|    #include <libxml/parser.h>
|   @@ -454,6 +455,8 @@ xmlnode_parser_element_start_libxml(void
|    	xmlnode *node;
|    	int i;
|    
|   +purple_debug_error("MARK", "\nelement_name=%s, prefix=%s, xmlns=%s\n", element_name, prefix, xmlns);
|   +
|    	if(!element_name || xpd->error) {
|    		return;
|    	} else {

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 20a1ba72d00c9f9c028323b31adfea0311e51c6f