telepathy-farstream: Remove deprecated TP_ERRORS

Olivier Crête tester at kemper.freedesktop.org
Tue Aug 21 19:45:40 PDT 2012


Module: telepathy-farstream
Branch: master
Commit: 5baebea7b3d7b5cb6afc37989a5e42d365c15052
URL:    http://cgit.freedesktop.org/telepathy/telepathy-farstream/commit/?id=5baebea7b3d7b5cb6afc37989a5e42d365c15052

Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Tue Aug 21 19:43:29 2012 -0700

Remove deprecated TP_ERRORS

---

 telepathy-farstream/channel.c |    2 +-
 telepathy-farstream/stream.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/telepathy-farstream/channel.c b/telepathy-farstream/channel.c
index 175e863..f509085 100644
--- a/telepathy-farstream/channel.c
+++ b/telepathy-farstream/channel.c
@@ -358,7 +358,7 @@ channel_prepared (GObject *obj,
     }
   else
     {
-      g_simple_async_result_set_error (res, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+      g_simple_async_result_set_error (res, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
           "Channel does not implement "
           TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING " or "
           TP_IFACE_CHANNEL_TYPE_CALL);
diff --git a/telepathy-farstream/stream.c b/telepathy-farstream/stream.c
index 2039dfe..7dd1e0c 100644
--- a/telepathy-farstream/stream.c
+++ b/telepathy-farstream/stream.c
@@ -1149,7 +1149,7 @@ async_method_callback_optional (TpMediaStreamHandler *proxy G_GNUC_UNUSED,
 {
   if (error == NULL ||
       g_error_matches (error, DBUS_GERROR, G_DBUS_ERROR_UNKNOWN_METHOD) ||
-      g_error_matches (error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED))
+      g_error_matches (error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED))
     return;
 
   async_method_callback (proxy, error, user_data, weak_object);



More information about the telepathy-commits mailing list