diff options
| author | Davyd Madeley <davyd@madeley.id.au> | 2009-05-28 17:54:30 +0800 |
|---|---|---|
| committer | Davyd Madeley <davyd@madeley.id.au> | 2009-05-28 17:54:30 +0800 |
| commit | d151261308da99f44410da4f07b78dd56c0cb5f8 (patch) | |
| tree | 3ce7b7afbd3e5556cc4d135b4805c41c62fd2acc /src | |
| parent | 395a0eaf7520826c13d7f4b193aa0907b54cf46a (diff) | |
| parent | 545342a22a793a45b8f1150c57b8abaa42a5fa7d (diff) | |
| download | gsoc2013-empathy-d151261308da99f44410da4f07b78dd56c0cb5f8.tar gsoc2013-empathy-d151261308da99f44410da4f07b78dd56c0cb5f8.tar.gz gsoc2013-empathy-d151261308da99f44410da4f07b78dd56c0cb5f8.tar.bz2 gsoc2013-empathy-d151261308da99f44410da4f07b78dd56c0cb5f8.tar.lz gsoc2013-empathy-d151261308da99f44410da4f07b78dd56c0cb5f8.tar.xz gsoc2013-empathy-d151261308da99f44410da4f07b78dd56c0cb5f8.tar.zst gsoc2013-empathy-d151261308da99f44410da4f07b78dd56c0cb5f8.zip | |
Merge commit 'origin/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-event-manager.c | 4 | ||||
| -rw-r--r-- | src/empathy-tube-dispatch.c | 8 |
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)) |