Mercurial > pidgin
comparison libpurple/protocols/jabber/adhoccommands.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 | 5103485b4b26 |
children | 38cc722159ff |
comparison
equal
deleted
inserted
replaced
20813:66e7b104b4ea | 20814:bde477ec6a71 |
---|---|
130 const char *status = xmlnode_get_attrib(command,"status"); | 130 const char *status = xmlnode_get_attrib(command,"status"); |
131 xmlnode *xdata = xmlnode_get_child_with_namespace(command,"x","jabber:x:data"); | 131 xmlnode *xdata = xmlnode_get_child_with_namespace(command,"x","jabber:x:data"); |
132 const char *type = xmlnode_get_attrib(packet,"type"); | 132 const char *type = xmlnode_get_attrib(packet,"type"); |
133 | 133 |
134 if(type && !strcmp(type,"error")) { | 134 if(type && !strcmp(type,"error")) { |
135 char *msg = jabber_parse_error(js, packet); | 135 char *msg = jabber_parse_error(js, packet, NULL); |
136 if(!msg) | 136 if(!msg) |
137 msg = g_strdup(_("Unknown Error")); | 137 msg = g_strdup(_("Unknown Error")); |
138 | 138 |
139 purple_notify_error(NULL, _("Ad-Hoc Command Failed"), | 139 purple_notify_error(NULL, _("Ad-Hoc Command Failed"), |
140 _("Ad-Hoc Command Failed"), msg); | 140 _("Ad-Hoc Command Failed"), msg); |