aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-29 20:04:15 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-29 20:04:38 +0800
commit12c53ccc7ab841ec7a6e52c3718316952d2518a9 (patch)
treec7bc9ac6cd1da26cbd341f72bf363ae2219e2b5f
parent733e7394cb7f805c41332c07336347e87b86c590 (diff)
downloadgsoc2013-empathy-12c53ccc7ab841ec7a6e52c3718316952d2518a9.tar
gsoc2013-empathy-12c53ccc7ab841ec7a6e52c3718316952d2518a9.tar.gz
gsoc2013-empathy-12c53ccc7ab841ec7a6e52c3718316952d2518a9.tar.bz2
gsoc2013-empathy-12c53ccc7ab841ec7a6e52c3718316952d2518a9.tar.lz
gsoc2013-empathy-12c53ccc7ab841ec7a6e52c3718316952d2518a9.tar.xz
gsoc2013-empathy-12c53ccc7ab841ec7a6e52c3718316952d2518a9.tar.zst
gsoc2013-empathy-12c53ccc7ab841ec7a6e52c3718316952d2518a9.zip
use tp-glib API for Conference (#630709)
-rw-r--r--libempathy/empathy-tp-chat.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 375683b62..ae9a532d0 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -159,9 +159,9 @@ tp_chat_add (EmpathyContactList *list,
TP_IFACE_CHANNEL_TYPE_TEXT,
TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
TP_HANDLE_TYPE_NONE,
- EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels",
+ TP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels",
TP_ARRAY_TYPE_OBJECT_PATH_LIST, &channels,
- EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialInviteeIDs",
+ TP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialInviteeIDs",
G_TYPE_STRV, invitees,
/* FIXME: InvitationMessage ? */
NULL);
@@ -907,7 +907,7 @@ tp_chat_update_remote_contact (EmpathyTpChat *chat)
* have the group interface. If it has the conference interface, then
* it is indeed a MUC. */
if (tp_proxy_has_interface_by_id (priv->channel,
- EMP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE)) {
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE)) {
return;
}
@@ -1320,7 +1320,7 @@ tp_chat_constructor (GType type,
const char **oprops = g_value_get_boxed (
g_value_array_get_nth (array, 1));
- if (tp_strv_contains (oprops, EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels")) {
+ if (tp_strv_contains (oprops, TP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels")) {
priv->can_upgrade_to_muc = TRUE;
break;
}