summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <olivier.crete@collabora.com>2012-08-22 02:43:29 (GMT)
committerOlivier Crête <olivier.crete@collabora.com>2012-08-22 02:45:16 (GMT)
commit5baebea7b3d7b5cb6afc37989a5e42d365c15052 (patch)
tree065b1bd9fbb4416162460a98073d046c55d519db
parent66fc42f109712f3ab44e0daee5fca4ce861e2000 (diff)
downloadtelepathy-farstream-5baebea7b3d7b5cb6afc37989a5e42d365c15052.tar.gz
telepathy-farstream-5baebea7b3d7b5cb6afc37989a5e42d365c15052.tar.xz
Remove deprecated TP_ERRORS
-rw-r--r--telepathy-farstream/channel.c2
-rw-r--r--telepathy-farstream/stream.c2
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);