aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-05-26 22:38:56 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-05-28 17:20:00 +0800
commit545342a22a793a45b8f1150c57b8abaa42a5fa7d (patch)
treea0d998ed3b0d6599df7385c02db1dbc1aeb7f6e4 /src
parent2a0e56361c6fc9c0e3869dc99375dd5a11f55fbe (diff)
downloadgsoc2013-empathy-545342a22a793a45b8f1150c57b8abaa42a5fa7d.tar
gsoc2013-empathy-545342a22a793a45b8f1150c57b8abaa42a5fa7d.tar.gz
gsoc2013-empathy-545342a22a793a45b8f1150c57b8abaa42a5fa7d.tar.bz2
gsoc2013-empathy-545342a22a793a45b8f1150c57b8abaa42a5fa7d.tar.lz
gsoc2013-empathy-545342a22a793a45b8f1150c57b8abaa42a5fa7d.tar.xz
gsoc2013-empathy-545342a22a793a45b8f1150c57b8abaa42a5fa7d.tar.zst
gsoc2013-empathy-545342a22a793a45b8f1150c57b8abaa42a5fa7d.zip
new tube API is now stable
Diffstat (limited to 'src')
-rw-r--r--src/empathy-event-manager.c4
-rw-r--r--src/empathy-tube-dispatch.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 57434e912..bd31b193e 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -857,8 +857,8 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher,
g_free (header);
}
- else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_STREAM_TUBE) ||
- !tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
+ else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE) ||
+ !tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
{
TpChannel *channel;
TpHandle handle;
diff --git a/src/empathy-tube-dispatch.c b/src/empathy-tube-dispatch.c
index 545f67935..67db5a3a3 100644
--- a/src/empathy-tube-dispatch.c
+++ b/src/empathy-tube-dispatch.c
@@ -159,19 +159,19 @@ empathy_tube_dispatch_constructed (GObject *object)
if (channel_type == NULL)
goto failed;
- if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
+ if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
{
type = TP_TUBE_TYPE_STREAM;
service = tp_asv_get_string (properties,
- EMP_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service");
+ TP_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service");
}
- else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
+ else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
{
GError *error = NULL;
type = TP_TUBE_TYPE_DBUS;
service = tp_asv_get_string (properties,
- EMP_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName");
+ TP_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName");
if (!tp_dbus_check_valid_bus_name (service, TP_DBUS_NAME_TYPE_WELL_KNOWN,
&error))