# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1072230505 0
# Node ID 68900f9cb540f920b237e828b35a92b352a3998b
# Parent  2014b91db201351b6502a73463cfe66086a8630a
[gaim-migrate @ 8597]
tweak tweaky tweak

committer: Tailor Script <tailor@pidgin.im>

diff -r 2014b91db201 -r 68900f9cb540 po/POTFILES.in
--- a/po/POTFILES.in	Tue Dec 23 23:41:51 2003 +0000
+++ b/po/POTFILES.in	Wed Dec 24 01:48:25 2003 +0000
@@ -76,6 +76,7 @@
 src/protocols/jabber/presence.c
 src/protocols/jabber/roster.c
 src/protocols/jabber/si.c
+src/protocols/jabber/xdata.c
 src/protocols/msn/dispatch.c
 src/protocols/msn/error.c
 src/protocols/msn/httpmethod.c
diff -r 2014b91db201 -r 68900f9cb540 src/protocols/jabber/JEPS
--- a/src/protocols/jabber/JEPS	Tue Dec 23 23:41:51 2003 +0000
+++ b/src/protocols/jabber/JEPS	Wed Dec 24 01:48:25 2003 +0000
@@ -1,5 +1,3 @@
-0004: NEED
-	Data Gathering and Reporting
 0045: IN PROGRESS
 	Multi-User Chat
 0047: IN PROGRESS
diff -r 2014b91db201 -r 68900f9cb540 src/protocols/jabber/chat.c
--- a/src/protocols/jabber/chat.c	Tue Dec 23 23:41:51 2003 +0000
+++ b/src/protocols/jabber/chat.c	Wed Dec 24 01:48:25 2003 +0000
@@ -290,6 +290,7 @@
 	xmlnode *query, *x;
 	const char *type = xmlnode_get_attrib(packet, "type");
 	const char *from = xmlnode_get_attrib(packet, "from");
+	char *msg;
 	JabberChat *chat;
 	JabberID *jid;
 
@@ -297,6 +298,7 @@
 		return;
 
 
+
 	if(!strcmp(type, "result")) {
 		jid = jabber_id_new(from);
 
@@ -325,10 +327,35 @@
 				return;
 			}
 		}
-	} else {
-		/* XXX: handle errors */
+	} else if(!strcmp(type, "error")) {
+		xmlnode *errnode = xmlnode_get_child(packet, "error");
+		const char *code = NULL;
+		char *code_txt = NULL;
+		char *msg;
+		char *text = NULL;
+
+		if(errnode) {
+			code = xmlnode_get_attrib(errnode, "code");
+			text = xmlnode_get_data(errnode);
+		}
+
+		if(code)
+			code_txt = g_strdup_printf(_(" (Code %s)"), code);
+
+		msg = g_strdup_printf("%s%s", text ? text : "", code_txt ? code_txt : "");
+		gaim_notify_error(js->gc, _("Configuration error"), _("Configuration error"), msg);
+
+		g_free(msg);
+		if(code_txt)
+			g_free(code_txt);
+
+		return;
 	}
 
+	msg = g_strdup_printf("Unable to configure room %s", from);
+
+	gaim_notify_info(js->gc, _("Unable to configure"), _("Unable to configure"), msg);
+	g_free(msg);
 
 }
 
diff -r 2014b91db201 -r 68900f9cb540 src/protocols/jabber/xdata.h
--- a/src/protocols/jabber/xdata.h	Tue Dec 23 23:41:51 2003 +0000
+++ b/src/protocols/jabber/xdata.h	Wed Dec 24 01:48:25 2003 +0000
@@ -1,5 +1,5 @@
 /**
- * @file jutil.h utility functions
+ * @file xdata.h utility functions
  *
  * gaim
  *