# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1066946176 0
# Node ID c41e522028f28b89dd19c116ff241cfd0d207c62
# Parent  578f3ae5a8c0984dafc837e078e961884fba31f1
[gaim-migrate @ 7907]
and an error message about joining a chat, when you've been in that chat all day is pretty dumb.

committer: Tailor Script <tailor@pidgin.im>

diff -r 578f3ae5a8c0 -r c41e522028f2 src/protocols/jabber/presence.c
--- a/src/protocols/jabber/presence.c	Thu Oct 23 21:44:50 2003 +0000
+++ b/src/protocols/jabber/presence.c	Thu Oct 23 21:56:16 2003 +0000
@@ -254,18 +254,23 @@
 
 			if(!code)
 				code = "";
-			if(!text)
-				text = g_strdup(_("Unable to join chat"));
 
-			buf = g_strdup_printf("Error %s joining chat %s: %s",
-					code, from, text);
+			if(chat->conv) {
+				if(!text)
+					text = g_strdup(_("Unknown error"));
+				buf = g_strdup_printf("Error %s in chat %s: %s",
+						code, from, text);
+				serv_got_chat_left(js->gc, chat->id);
+			} else {
+				if(!text)
+					text = g_strdup(_("Unable to join chat"));
+				buf = g_strdup_printf("Error %s joining chat %s: %s",
+						code, from, text);
+			}
 			gaim_notify_error(js->gc, _("Error"), _("Error"), buf);
 			g_free(text);
 			g_free(buf);
 
-			if(chat->conv)
-				serv_got_chat_left(js->gc, chat->id);
-
 			jabber_chat_destroy(chat);
 			jabber_id_free(jid);
 			return;