# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1211335113 0
# Node ID 16bdfbe5b0b43fd31b0dcf58708f8d0836c44853
# Parent  c2035c3ef2dcd16384b2ca7fd5b692515f57723b# Parent  8fbfe45506a2819730c88910c3f2f75662c5b5e0
merge of '087a5ba38e7c36e0076c92f4cf8501f24f7314b0'
     and '3a9ac82965e1bb9e43e45fc91f62aab67d5d6b83'

diff -r c2035c3ef2dc -r 16bdfbe5b0b4 libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Wed May 21 01:57:04 2008 +0000
+++ b/libpurple/protocols/jabber/message.c	Wed May 21 01:58:33 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);