From 3a1d6cfff33f6e7671e5cce547225001728c3c46 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 6 Aug 2012 13:50:30 +0100 Subject: [PATCH 1/2] Avoid deprecated things --- telepathy-ytstenut-glib/account-manager.c | 2 +- telepathy-ytstenut-glib/channel.c | 2 +- telepathy-ytstenut-glib/status.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/telepathy-ytstenut-glib/account-manager.c b/telepathy-ytstenut-glib/account-manager.c index 9d883df..1de9e71 100644 --- a/telepathy-ytstenut-glib/account-manager.c +++ b/telepathy-ytstenut-glib/account-manager.c @@ -127,7 +127,7 @@ tp_yts_account_manager_class_init (TpYtsAccountManagerClass *klass) tp_proxy_or_subclass_hook_on_interface_add (tp_type, tp_yts_account_manager_add_signals); tp_proxy_subclass_add_error_mapping (tp_type, - TP_ERROR_PREFIX, TP_ERRORS, TP_TYPE_ERROR); + TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR); } /** diff --git a/telepathy-ytstenut-glib/channel.c b/telepathy-ytstenut-glib/channel.c index 029f0e6..6f7e8f0 100644 --- a/telepathy-ytstenut-glib/channel.c +++ b/telepathy-ytstenut-glib/channel.c @@ -207,7 +207,7 @@ tp_yts_channel_class_init (TpYtsChannelClass *klass) tp_proxy_or_subclass_hook_on_interface_add (tp_type, tp_yts_channel_add_signals); tp_proxy_subclass_add_error_mapping (tp_type, - TP_ERROR_PREFIX, TP_ERRORS, TP_TYPE_ERROR); + TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR); /** * TpYtsChannel:request-type: diff --git a/telepathy-ytstenut-glib/status.c b/telepathy-ytstenut-glib/status.c index ca0d8aa..e84c7b8 100644 --- a/telepathy-ytstenut-glib/status.c +++ b/telepathy-ytstenut-glib/status.c @@ -488,7 +488,7 @@ tp_yts_status_class_init (TpYtsStatusClass *klass) tp_proxy_or_subclass_hook_on_interface_add (tp_type, tp_yts_status_add_signals); tp_proxy_subclass_add_error_mapping (tp_type, - TP_ERROR_PREFIX, TP_ERRORS, TP_TYPE_ERROR); + TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR); } static void @@ -685,7 +685,7 @@ on_account_timeout (gpointer user_data) g_signal_handler_disconnect (data->account, data->handler_id); - g_simple_async_result_set_error (data->res, TP_ERRORS, + g_simple_async_result_set_error (data->res, TP_ERROR, TP_ERROR_DISCONNECTED, "The account is not connected"); g_simple_async_result_complete (data->res); g_object_unref (data->res); -- 1.7.10.4