Mercurial > pidgin
changeset 23081:69796bbe7a6d
merge of '59d7f03afa561d4e3ef6d618e8d8d2a99c0dee88'
and '987d475b7796c72aacb0fbc5112840600ba70d61'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 21 May 2008 01:59:38 +0000 |
| parents | 16bdfbe5b0b4 (diff) 0ae9c9befa63 (current diff) |
| children | cd007fd9cf83 25161f5ea347 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);