diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 17:17:15 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-07 19:17:57 +0100 |
| commit | ffa3b8074f3cddbaa9796871a1d887f3327456d4 (patch) | |
| tree | 9fea24334cbde81973465b2deade8814536ffeaf /src/olpc-activity.c | |
| parent | 83c0f5a8f674794bab1b62aebb2c1bf21fa34c95 (diff) | |
| download | telepathy-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/olpc-activity.c')
| -rw-r--r-- | src/olpc-activity.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/olpc-activity.c b/src/olpc-activity.c index 4077559f..333c884d 100644 --- a/src/olpc-activity.c +++ b/src/olpc-activity.c @@ -329,7 +329,7 @@ send_properties_change_msg (SalutOlpcActivity *self, result = gibber_muc_connection_send (muc_connection, stanza, &err); if (!result) { - g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR, "%s", + g_set_error (error, TP_ERROR, TP_ERROR_NETWORK_ERROR, "%s", err->message); g_error_free (err); } @@ -408,7 +408,7 @@ salut_olpc_activity_announce (SalutOlpcActivity *self, if (!SALUT_OLPC_ACTIVITY_GET_CLASS (self)->announce (self, &err)) { - g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR, "%s", + g_set_error (error, TP_ERROR, TP_ERROR_NETWORK_ERROR, "%s", err->message); g_error_free (err); return FALSE; @@ -563,7 +563,7 @@ salut_olpc_activity_joined (SalutOlpcActivity *self, if (priv->muc == NULL) { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Can't find muc channel for room %s", tp_handle_inspect ( room_repo, self->room)); return FALSE; |