# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1211335178 0
# Node ID 69796bbe7a6d4e51b2cbe86c74a9af1c05f109f7
# Parent  16bdfbe5b0b43fd31b0dcf58708f8d0836c44853# Parent  0ae9c9befa63221c8ce0fcbf4e17024fd996e2e7
merge of '59d7f03afa561d4e3ef6d618e8d8d2a99c0dee88'
     and '987d475b7796c72aacb0fbc5112840600ba70d61'

diff -r 0ae9c9befa63 -r 69796bbe7a6d libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Wed May 21 01:57:07 2008 +0000
+++ b/libpurple/protocols/jabber/message.c	Wed May 21 01:59:38 2008 +0000
@@ -411,10 +411,12 @@
 			}
 
 			if(code)
-				code_txt = g_strdup_printf(_(" (Code %s)"), code);
+				code_txt = g_strdup_printf(_("(Code %s)"), code);
 
 			if(!jm->error)
-				jm->error = g_strdup_printf("%s%s", text ? text : "",
+				jm->error = g_strdup_printf("%s%s%s",
+						text ? text : "",
+						text && code_text ? " " : "",
 						code_txt ? code_txt : "");
 
 			g_free(code_txt);