Revision b6bc31e96f744fe3a330381179f063ad1832253e

[markdoliner at pidgin.im]

o   -----------------------------------------------------------------
|   Revision: b6bc31e96f744fe3a330381179f063ad1832253e
|   Ancestor: 588ec1afa9093fc11bc17a35fb580cffe470bd00
|   Author: markdoliner at pidgin.im
|   Date: 2007-03-25T07:01:57
|   Branch: im.pidgin.pidgin
|   
|   Modified files:
|           libpurple/protocols/jabber/jabber.c libpurple/xmlnode.c
|   
|   ChangeLog: 
|   
|   Correctly handle the Jabber disconnection error for signing onto the
|   same resource from two locations.
|   
|   ============================================================
|   --- libpurple/protocols/jabber/jabber.c	c4cd9ad987f68c49faa0a87362a22cefa437ecc5
|   +++ libpurple/protocols/jabber/jabber.c	e533728a16a47f804a08f3b36f19268f88513356
|   @@ -162,7 +162,6 @@ 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);
|   @@ -1454,7 +1453,6 @@ 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);
|   @@ -1530,14 +1528,14 @@ purple_debug_error("MARK", "in jabber_pa
|    			js->gc->wants_to_die = TRUE;
|    			text = _("Authentication Failure");
|    		}
|   -	} else if(!strcmp(packet->name, "stream:error")) {
|   -purple_debug_error("MARK", "stream:error\n");
|   +	} else if(!strcmp(packet->name, "stream:error") ||
|   +			 (!strcmp(packet->name, "error") &&
|   +				!strcmp(xmlnode_get_namespace(packet), "http://etherx.jabber.org/streams"))) {
|    		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")) {
|   @@ -1587,7 +1585,6 @@ purple_debug_error("MARK", "conflict\n")
|    		}
|    	}
|    
|   -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/xmlnode.c	c52baf74d09cca1ded4d62334c25717cd4f2bacd
|   +++ libpurple/xmlnode.c	be87af120bf9ce453221a4f563982650c49f7762
|   @@ -455,8 +455,6 @@ 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 b6bc31e96f744fe3a330381179f063ad1832253e