summaryrefslogtreecommitdiff
path: root/wocky/wocky-jabber-auth.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-10-31 17:51:00 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-10-31 19:09:26 +0000
commit8ad2d40ad4f1abb6c85db0a4b5404fac59d92adc (patch)
tree18465c9d29776c7e76d882369c41766559493c4f /wocky/wocky-jabber-auth.c
parente5f1843e69cc6499c88deeb83d650a1deee0e798 (diff)
Use wocky_stanza_extract_stream_error() more widely
Diffstat (limited to 'wocky/wocky-jabber-auth.c')
-rw-r--r--wocky/wocky-jabber-auth.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/wocky/wocky-jabber-auth.c b/wocky/wocky-jabber-auth.c
index 7d5cc43..3879872 100644
--- a/wocky/wocky-jabber-auth.c
+++ b/wocky/wocky-jabber-auth.c
@@ -303,7 +303,7 @@ auth_failed (WockyJabberAuth *self, gint code, const gchar *format, ...)
static gboolean
stream_error (WockyJabberAuth *self, WockyStanza *stanza)
{
- WockyStanzaType type = WOCKY_STANZA_TYPE_NONE;
+ GError *error = NULL;
if (stanza == NULL)
{
@@ -311,13 +311,8 @@ stream_error (WockyJabberAuth *self, WockyStanza *stanza)
return TRUE;
}
- wocky_stanza_get_type_info (stanza, &type, NULL);
-
- if (type == WOCKY_STANZA_TYPE_STREAM_ERROR)
+ if (wocky_stanza_extract_stream_error (stanza, &error))
{
- GError *error = wocky_xmpp_stream_error_from_node (
- wocky_stanza_get_top_node (stanza));
-
auth_failed (self, WOCKY_AUTH_ERROR_STREAM, "%s: %s",
wocky_enum_to_nick (WOCKY_TYPE_XMPP_STREAM_ERROR, error->code),
error->message);