summaryrefslogtreecommitdiff
path: root/lib/gibber/gibber-bytestream-direct.c
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-05-04 14:26:07 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-05-04 14:26:07 +0100
commit01a4df8810bf41ecbb8c44eb3ce10d0a360dd379 (patch)
tree075848d88d7b22ae33a5312338118e62b0a4dc0b /lib/gibber/gibber-bytestream-direct.c
parent484325b8891af7d0ba92d796fa8804481b9e846a (diff)
downloadtelepathy-salut-01a4df8810bf41ecbb8c44eb3ce10d0a360dd379.tar.gz
stop using GibberXmppError
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'lib/gibber/gibber-bytestream-direct.c')
-rw-r--r--lib/gibber/gibber-bytestream-direct.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c
index 81c6ba6e..3503819f 100644
--- a/lib/gibber/gibber-bytestream-direct.c
+++ b/lib/gibber/gibber-bytestream-direct.c
@@ -25,10 +25,11 @@
#include <glib.h>
+#include <wocky/wocky-xmpp-error.h>
+
#include "gibber-sockets.h"
#include "gibber-linklocal-transport.h"
#include "gibber-util.h"
-#include "gibber-xmpp-error.h"
#define DEBUG_FLAG DEBUG_BYTESTREAM
#include "gibber-debug.h"
@@ -353,7 +354,7 @@ transport_disconnected_cb (GibberTransport *transport,
if (priv->state == GIBBER_BYTESTREAM_STATE_ACCEPTED)
{
/* Connection to host failed */
- GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+ GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
"connection failed" };
gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);
@@ -599,7 +600,7 @@ gibber_bytestream_direct_initiate (GibberBytestreamIface *bytestream)
g_assert (priv->addresses != NULL);
if (priv->addresses->len < 1)
{
- GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+ GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
"Unsable get socket address for this contact" };
DEBUG ("Could not get socket address for this contact" );
gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);