Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/presence.c @ 20814:bde477ec6a71
Stop jabber setting wants_to_die itself. This involved plumbing disconnection
reasons into jabber_parse_error in a slightly dubious fashion. I'd appreciate
someone sanity-checking this rev.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Tue, 09 Oct 2007 13:32:58 +0000 |
| parents | ee8016f8208e |
| children | fa3c4c5dea66 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Tue Oct 09 13:25:47 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Tue Oct 09 13:32:58 2007 +0000 @@ -417,7 +417,7 @@ } if(type && !strcmp(type, "error")) { - char *msg = jabber_parse_error(js, packet); + char *msg = jabber_parse_error(js, packet, NULL); state = JABBER_BUDDY_STATE_ERROR; jb->error_msg = msg ? msg : g_strdup(_("Unknown Error in presence")); @@ -549,7 +549,7 @@ char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain); if(state == JABBER_BUDDY_STATE_ERROR) { - char *title, *msg = jabber_parse_error(js, packet); + char *title, *msg = jabber_parse_error(js, packet, NULL); if(chat->conv) { title = g_strdup_printf(_("Error in chat %s"), from);