summaryrefslogtreecommitdiff
path: root/src/im-manager.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-05-07 17:17:15 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-05-07 19:17:57 +0100
commitffa3b8074f3cddbaa9796871a1d887f3327456d4 (patch)
tree9fea24334cbde81973465b2deade8814536ffeaf /src/im-manager.c
parent83c0f5a8f674794bab1b62aebb2c1bf21fa34c95 (diff)
downloadtelepathy-salut-ffa3b8074f3cddbaa9796871a1d887f3327456d4.tar.gz
Use TP_ERROR instead of long-deprecated TP_ERRORS
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594 Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
Diffstat (limited to 'src/im-manager.c')
-rw-r--r--src/im-manager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/im-manager.c b/src/im-manager.c
index e0f6bf18..fe5c7bca 100644
--- a/src/im-manager.c
+++ b/src/im-manager.c
@@ -414,7 +414,7 @@ salut_im_manager_requestotron (SalutImManager *self,
/* Don't support opening a channel to our self handle */
if (handle == base_conn->self_handle)
{
- g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+ g_set_error (&error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
"Can't open a text channel to yourself");
goto error;
}
@@ -430,7 +430,7 @@ salut_im_manager_requestotron (SalutImManager *self,
if (require_new)
{
- g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
+ g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
"Already chatting with contact #%u in another channel", handle);
goto error;
}
@@ -544,7 +544,7 @@ salut_im_manager_new_channel (SalutImManager *mgr,
if (contact == NULL)
{
gchar *message = g_strdup_printf ("%s is not online", name);
- tp_channel_manager_emit_request_failed (mgr, request, TP_ERRORS,
+ tp_channel_manager_emit_request_failed (mgr, request, TP_ERROR,
TP_ERROR_NOT_AVAILABLE, message);
g_free (message);
return NULL;