changeset 24471:e2f5a4a091b5

Don't log an error when parsing vcard data. Also, these messages apparently have newlines at the end of them, so don't add one ourselves.
author Mark Doliner <mark@kingant.net>
date Tue, 18 Nov 2008 02:00:48 +0000
parents d038fc351194
children 16f58b7418c0
files libpurple/protocols/jabber/parser.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/parser.c	Mon Nov 17 21:31:36 2008 +0000
+++ b/libpurple/protocols/jabber/parser.c	Tue Nov 18 02:00:48 2008 +0000
@@ -137,8 +137,16 @@
 {
 	JabberStream *js = user_data;
 
+	if (error->level == XML_ERR_WARNING && error->message != NULL
+			&& strcmp(error->message, "xmlns: URI vcard-temp is not absolute\n") == 0)
+		/*
+		 * This message happens when parsing vcards, and is normal, so don't
+		 * bother logging it because people scare easily.
+		 */
+		return;
+
 	purple_debug_error("jabber", "XML parser error for JabberStream %p: "
-								 "Domain %i, code %i, level %i: %s\n",
+								 "Domain %i, code %i, level %i: %s",
 					   js,
 					   error->domain, error->code, error->level,
 					   (error->message ? error->message : "(null)"));