diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-03-07 14:12:22 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-05-03 13:15:26 +0100 |
| commit | c1be75d93784a9b1b37b0dd717b1494029a675b8 (patch) | |
| tree | 4574a9773e515c020b706865fe07290f223c048f /src/conn-aliasing.c | |
| parent | ea21cdcd49ba24235f97060c056fe9cd9744e69e (diff) | |
| download | telepathy-gabble-c1be75d93784a9b1b37b0dd717b1494029a675b8.tar.gz | |
Remove GabbleXmppError.
There is a FIXME buried in here … but the tests pass.
Diffstat (limited to 'src/conn-aliasing.c')
| -rw-r--r-- | src/conn-aliasing.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c index c00fb60bb..08ca7cd76 100644 --- a/src/conn-aliasing.c +++ b/src/conn-aliasing.c @@ -25,6 +25,7 @@ #include <telepathy-glib/gtypes.h> #include <telepathy-glib/interfaces.h> #include <telepathy-glib/svc-connection.h> +#include <wocky/wocky-utils.h> #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION @@ -488,22 +489,14 @@ nick_publish_msg_reply_cb (GabbleConnection *conn, gpointer user_data) { #ifdef ENABLE_DEBUG - if (lm_message_get_sub_type (reply_msg) == LM_MESSAGE_SUB_TYPE_ERROR) - { - WockyNode *error_node; - - error_node = wocky_node_get_child ( - wocky_stanza_get_top_node (reply_msg), "error"); + GError *error = NULL; - if (error_node != NULL) - { - GabbleXmppError error = gabble_xmpp_error_from_node (error_node, - NULL); + if (wocky_stanza_extract_errors (reply_msg, NULL, &error, NULL, NULL)) + { + DEBUG ("can't publish nick using PEP: %s: %s", + wocky_xmpp_stanza_error_to_string (error), error->message); - DEBUG ("can't publish nick using PEP: %s: %s", - gabble_xmpp_error_string (error), - gabble_xmpp_error_description (error)); - } + g_clear_error (&error); } #endif |