[telepathy-gabble/master] use TP_ERROR_STR_* constants from tp-glib

[Guillaume Desmottes]

---
 src/tube-stream.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/tube-stream.c b/src/tube-stream.c
index d1156db..7dc4a16 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -64,13 +64,6 @@
 #include "tube-iface.h"
 #include "util.h"
 
-#define GABBLE_ERROR_STR_CONNECTION_LOST \
-  "org.freedesktop.Telepathy.Error.ConnectionLost"
-#define GABBLE_ERROR_STR_CONNECTION_REFUSED \
-  "org.freedesktop.Telepathy.Error.ConnectionRefused"
-#define GABBLE_ERROR_STR_CANCELLED \
-  "org.freedesktop.Telepathy.Error.Cancelled"
-
 static void channel_iface_init (gpointer, gpointer);
 static void tube_iface_init (gpointer g_iface, gpointer iface_data);
 static void streamtube_iface_init (gpointer g_iface, gpointer iface_data);
@@ -292,7 +285,7 @@ transport_disconnected_cb (GibberTransport *transport,
   GabbleTubeStreamPrivate *priv = GABBLE_TUBE_STREAM_GET_PRIVATE (self);
   GabbleBytestreamIface *bytestream;
 
-  fire_connection_closed (self, transport, GABBLE_ERROR_STR_CANCELLED,
+  fire_connection_closed (self, transport, TP_ERROR_STR_CANCELLED,
       "local socket has been disconnected");
 
   bytestream = g_hash_table_lookup (priv->transport_to_bytestream, transport);
@@ -322,7 +315,7 @@ remove_transport (GabbleTubeStream *self,
 
   gibber_transport_disconnect (transport);
 
-  fire_connection_closed (self, transport, GABBLE_ERROR_STR_CONNECTION_LOST,
+  fire_connection_closed (self, transport, TP_ERROR_STR_CONNECTION_LOST,
       "bytestream has been broken");
 
   /* the transport may not be in transport_to_bytestream if the bytestream was
@@ -467,7 +460,7 @@ extra_bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
       DEBUG ("initiator refused new bytestream");
 
       fire_connection_closed (self, transport,
-          GABBLE_ERROR_STR_CONNECTION_REFUSED, "connection has been refused");
+          TP_ERROR_STR_CONNECTION_REFUSED, "connection has been refused");
 
       g_object_unref (transport);
       return;
@@ -1163,7 +1156,7 @@ close_each_extra_bytestream (gpointer key,
 
   gabble_bytestream_iface_close (bytestream, NULL);
   gibber_transport_disconnect (transport);
-  fire_connection_closed (self, transport, GABBLE_ERROR_STR_CANCELLED,
+  fire_connection_closed (self, transport, TP_ERROR_STR_CANCELLED,
       "tube is closing");
 
   g_hash_table_remove (priv->transport_to_bytestream, transport);
-- 
1.5.6.5