Mercurial > pidgin.yaz

changeset 15916:8bcd5840fb12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mark Doliner <mark@kingant.net>
date Sun, 25 Mar 2007 06:24:04 +0000
parents bc25193e1cb3
children 40a8cefe4fcd
files libpurple/protocols/jabber/jabber.c libpurple/protocols/oscar/oscar_data.c libpurple/xmlnode.c
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Sun Mar 25 06:16:56 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sun Mar 25 06:24:04 2007 +0000
@@ -162,6 +162,7 @@
 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 @@
 	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 @@
 			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 @@
 		}
 	}
 
+purple_debug_error("MARK", "text=\n", text);
 	if(text || cdata) {
 		char *ret = g_strdup_printf("%s%s%s", code ? code : "",
 				code ? ": " : "", text ? text : cdata);
--- a/libpurple/protocols/oscar/oscar_data.c	Sun Mar 25 06:16:56 2007 +0000
+++ b/libpurple/protocols/oscar/oscar_data.c	Sun Mar 25 06:24:04 2007 +0000
@@ -53,14 +53,14 @@
 	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);
--- a/libpurple/xmlnode.c	Sun Mar 25 06:16:56 2007 +0000
+++ b/libpurple/xmlnode.c	Sun Mar 25 06:24:04 2007 +0000
@@ -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 *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 {