diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-21 20:48:09 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-21 22:35:49 +0800 |
| commit | c91d6c07b42df289e40ccc59882d0ad60573c2d2 (patch) | |
| tree | 13f755e214427b0a889d636964dc244937646f87 | |
| parent | ddcd1beb479b2ba5884b2a4d3d626c2671c123d7 (diff) | |
| download | gsoc2013-empathy-c91d6c07b42df289e40ccc59882d0ad60573c2d2.tar gsoc2013-empathy-c91d6c07b42df289e40ccc59882d0ad60573c2d2.tar.gz gsoc2013-empathy-c91d6c07b42df289e40ccc59882d0ad60573c2d2.tar.bz2 gsoc2013-empathy-c91d6c07b42df289e40ccc59882d0ad60573c2d2.tar.lz gsoc2013-empathy-c91d6c07b42df289e40ccc59882d0ad60573c2d2.tar.xz gsoc2013-empathy-c91d6c07b42df289e40ccc59882d0ad60573c2d2.tar.zst gsoc2013-empathy-c91d6c07b42df289e40ccc59882d0ad60573c2d2.zip | |
stop using generated ServerTLSConnection API
It's been generated in telepathy-glib since 0.19.0
https://bugzilla.gnome.org/show_bug.cgi?id=630896
| -rw-r--r-- | libempathy/empathy-auth-factory.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-server-tls-handler.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index fdd38b517..04e619bd0 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -37,8 +37,6 @@ #include "empathy-uoa-auth-handler.h" #endif /* HAVE_UOA */ -#include "extensions.h" - #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" @@ -283,7 +281,7 @@ common_checks (EmpathyAuthFactory *self, * ServerTLSConnection channels. */ if (observe || tp_channel_get_channel_type_id (channel) != - EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) + TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) { g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Can only %s ServerTLSConnection or ServerAuthentication channels, " @@ -365,7 +363,7 @@ handle_channels (TpBaseClient *handler, /* create a handler */ if (tp_channel_get_channel_type_id (channel) == - EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) + TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) { empathy_server_tls_handler_new_async (channel, server_tls_handler_ready_cb, data); @@ -660,7 +658,7 @@ empathy_auth_factory_constructed (GObject *obj) tp_base_client_take_handler_filter (client, tp_asv_new ( /* ChannelType */ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - EMP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION, + TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION, /* AuthenticationMethod */ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE, NULL)); diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c index 0ac2a1f30..f5f60d649 100644 --- a/libempathy/empathy-server-tls-handler.c +++ b/libempathy/empathy-server-tls-handler.c @@ -24,7 +24,6 @@ #include <telepathy-glib/telepathy-glib-dbus.h> #include "empathy-utils.h" -#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" @@ -145,7 +144,7 @@ tls_handler_init_async (GAsyncInitable *initable, } g_variant_lookup (properties, - EMP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION ".ServerCertificate", + TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION ".ServerCertificate", "&o", &cert_object_path); bus_name = tp_proxy_get_bus_name (TP_PROXY (priv->channel)); |