aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-11-14 18:23:57 +0800
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-01-10 21:26:59 +0800
commitaf4d97822b9055fd8a7670b53b28c7c1f820ec65 (patch)
treeea2618caaee98e447e20e87dedf72ccd3d2bcbbb /libempathy
parent66e1966ee3b3303968997f229f62ada8d7b519ba (diff)
downloadgsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.gz
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.bz2
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.lz
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.xz
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.zst
gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.zip
Remove tp-yell and use TpCallChannel
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/Makefile.am2
-rw-r--r--libempathy/empathy-client-factory.c35
-rw-r--r--libempathy/empathy-contact.c15
3 files changed, 6 insertions, 46 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index da37ef371..ca02a18d3 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"empathy\" \
-DGCR_API_SUBJECT_TO_CHANGE \
$(EMPATHY_CFLAGS) \
- $(YELL_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(GEOCODE_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
@@ -147,7 +146,6 @@ nodist_libempathy_la_SOURCES =\
libempathy_la_LIBADD = \
$(top_builddir)/extensions/libemp-extensions.la \
- $(top_builddir)/telepathy-yell/telepathy-yell/libtelepathy-yell.la \
$(GCR_LIBS) \
$(EMPATHY_LIBS) \
$(GEOCLUE_LIBS) \
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 035c56956..65c0d267a 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -26,42 +26,12 @@
#include "empathy-tp-chat.h"
#include "empathy-utils.h"
-#include <telepathy-yell/telepathy-yell.h>
-
G_DEFINE_TYPE (EmpathyClientFactory, empathy_client_factory,
TP_TYPE_AUTOMATIC_CLIENT_FACTORY)
#define chainup ((TpSimpleClientFactoryClass *) \
empathy_client_factory_parent_class)
-/* FIXME: move to yell */
-static TpyCallChannel *
-call_channel_new_with_factory (TpSimpleClientFactory *factory,
- TpConnection *conn,
- const gchar *object_path,
- const GHashTable *immutable_properties,
- GError **error)
-{
- TpProxy *conn_proxy = (TpProxy *) conn;
-
- g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL);
- g_return_val_if_fail (object_path != NULL, NULL);
- g_return_val_if_fail (immutable_properties != NULL, NULL);
-
- if (!tp_dbus_check_valid_object_path (object_path, error))
- return NULL;
-
- return g_object_new (TPY_TYPE_CALL_CHANNEL,
- "factory", factory,
- "connection", conn,
- "dbus-daemon", conn_proxy->dbus_daemon,
- "bus-name", conn_proxy->bus_name,
- "object-path", object_path,
- "handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
- "channel-properties", immutable_properties,
- NULL);
-}
-
static TpChannel *
empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
TpConnection *conn,
@@ -83,11 +53,6 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
TP_SIMPLE_CLIENT_FACTORY (factory), account, conn, path,
properties));
}
- else if (!tp_strdiff (chan_type, TPY_IFACE_CHANNEL_TYPE_CALL))
- {
- return TP_CHANNEL (call_channel_new_with_factory (
- TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
- }
return chainup->create_channel (factory, conn, path, properties, error);
}
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index c947fad62..b8d2f3c40 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -28,7 +28,6 @@
#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/util.h>
-#include <telepathy-yell/telepathy-yell.h>
#include <telepathy-logger/log-manager.h>
@@ -1741,8 +1740,7 @@ tp_caps_to_capabilities (TpCapabilities *caps)
if (!tp_strdiff (service, "rfb"))
capabilities |= EMPATHY_CAPABILITIES_RFB_STREAM_TUBE;
}
- else if (!tp_strdiff (chan_type,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
+ else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
{
guint j;
@@ -1769,26 +1767,25 @@ tp_caps_to_capabilities (TpCapabilities *caps)
TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL, NULL))
capabilities |= EMPATHY_CAPABILITIES_SMS;
}
- else if (!tp_strdiff (chan_type,
- TPY_IFACE_CHANNEL_TYPE_CALL))
+ else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CALL))
{
guint j;
if (tp_asv_get_boolean (fixed_prop,
- TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL))
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL))
capabilities |= EMPATHY_CAPABILITIES_AUDIO;
if (tp_asv_get_boolean (fixed_prop,
- TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL))
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL))
capabilities |= EMPATHY_CAPABILITIES_VIDEO;
for (j = 0; allowed_prop[j] != NULL; j++)
{
if (!tp_strdiff (allowed_prop[j],
- TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO))
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO))
capabilities |= EMPATHY_CAPABILITIES_AUDIO;
else if (!tp_strdiff (allowed_prop[j],
- TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO))
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO))
capabilities |= EMPATHY_CAPABILITIES_VIDEO;
}
}