aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-07 17:10:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-07 17:10:17 +0800
commitd0193ecc58b6eab69b4c4d3c9667c50bfc033b49 (patch)
tree7de875e06499adace751f64d27b16d614a009f84 /libempathy
parent9923159863e58051f64cc7a60b3fa16184526db8 (diff)
downloadgsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.gz
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.bz2
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.lz
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.xz
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.zst
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.zip
Use TP_ERROR instead of TP_ERRORS
The latter has been deprecated in tp-glib master.
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-chat.c2
-rw-r--r--libempathy/empathy-tp-contact-factory.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 390f9a533..b35290cde 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -494,7 +494,7 @@ message_sent_cb (TpTextChannel *channel,
static TpChannelTextSendError
error_to_text_send_error (GError *error)
{
- if (error->domain != TP_ERRORS)
+ if (error->domain != TP_ERROR)
return TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN;
switch (error->code)
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 681c882ee..111e3190a 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -298,7 +298,7 @@ get_contact_by_handle_cb (TpConnection *connection,
* so the caller of empathy_tp_contact_factory_get_from_handle can
* rely on the error to check if the operation succeeded or not. */
- err = g_error_new_literal (TP_ERRORS, TP_ERROR_INVALID_HANDLE,
+ err = g_error_new_literal (TP_ERROR, TP_ERROR_INVALID_HANDLE,
"handle is invalid");
}
else {