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-09 19:54:17 +0800
commit5cdb08a0601008eb6fa3402d7a34406e358ccdf7 (patch)
treed9dbe02d4fbc841e267279fd74b3d504f2b8b2e0 /libempathy
parent689ad874fb13b6485e7f7c3a1c93bfb8e50b34e9 (diff)
downloadgsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar
gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.gz
gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.bz2
gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.lz
gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.xz
gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.zst
gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.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 4e26a769b..e90f6ede2 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -492,7 +492,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 {