Mercurial > pidgin
changeset 23079:16bdfbe5b0b4
merge of '087a5ba38e7c36e0076c92f4cf8501f24f7314b0'
and '3a9ac82965e1bb9e43e45fc91f62aab67d5d6b83'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 21 May 2008 01:58:33 +0000 |
| parents | c2035c3ef2dc (current diff) 8fbfe45506a2 (diff) |
| children | 69796bbe7a6d |
| files | libpurple/protocols/jabber/message.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);