Mercurial > ~mikael > mcabber > hg
diff mcabber/mcabber/xmpp_helper.c @ 1800:d2747442918a
When displaying a server error, show the sender JID
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Sat, 20 Mar 2010 15:27:26 +0100 |
| parents | e6e89b1d7831 |
| children | e6d355e50d7a |
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp_helper.c Sat Mar 20 15:11:13 2010 +0100 +++ b/mcabber/mcabber/xmpp_helper.c Sat Mar 20 15:27:26 2010 +0100 @@ -344,9 +344,9 @@ // display_server_error(x) // Display the error to the user // x: error tag xmlnode pointer -void display_server_error(LmMessageNode *x) +void display_server_error(LmMessageNode *x, const char *from) { - const char *desc = NULL, *errname=NULL, *s; + const char *desc = NULL, *errname = NULL, *s; char *sdesc, *tmp; if (!x) return; @@ -359,8 +359,13 @@ */ if (x->children) errname = x->children->name; - scr_LogPrint(LPRINT_LOGNORM, "Received error packet [%s]", - (errname ? errname : "")); + + if (from) + scr_LogPrint(LPRINT_LOGNORM, "Received error packet [%s] from <%s>", + (errname ? errname : ""), from); + else + scr_LogPrint(LPRINT_LOGNORM, "Received error packet [%s]", + (errname ? errname : "")); // For backward compatibility if (!errname && ((s = lm_message_node_get_attribute(x, "code")) != NULL)) {