aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-18 17:23:58 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-18 17:23:58 +0800
commit73720bb84423e70ad21599b4713d1137f8a85e73 (patch)
tree7390f9d38300a876ccfa76e6335d7fd8b9757c7b /libempathy
parent1d04deb0ffa562830485ba2eb626c123082afa3b (diff)
downloadgsoc2013-empathy-73720bb84423e70ad21599b4713d1137f8a85e73.tar
gsoc2013-empathy-73720bb84423e70ad21599b4713d1137f8a85e73.tar.gz
gsoc2013-empathy-73720bb84423e70ad21599b4713d1137f8a85e73.tar.bz2
gsoc2013-empathy-73720bb84423e70ad21599b4713d1137f8a85e73.tar.lz
gsoc2013-empathy-73720bb84423e70ad21599b4713d1137f8a85e73.tar.xz
gsoc2013-empathy-73720bb84423e70ad21599b4713d1137f8a85e73.tar.zst
gsoc2013-empathy-73720bb84423e70ad21599b4713d1137f8a85e73.zip
common_checks: rename must_be_sasl arg to observe
It was things clearer and easier to understand.
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-auth-factory.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 02a86861f..96b6bf58a 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -168,7 +168,7 @@ server_sasl_handler_ready_cb (GObject *source,
static gboolean
common_checks (EmpathyAuthFactory *self,
GList *channels,
- gboolean must_be_sasl,
+ gboolean observe,
GError **error)
{
EmpathyAuthFactoryPriv *priv = GET_PRIV (self);
@@ -195,7 +195,10 @@ common_checks (EmpathyAuthFactory *self,
if (tp_channel_get_channel_type_id (channel) !=
TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
{
- if (must_be_sasl
+ /* If we are observing we care only about ServerAuthentication channels.
+ * If we are handling we care about ServerAuthentication and
+ * ServerTLSConnection channels. */
+ if (observe
|| tp_channel_get_channel_type_id (channel) !=
EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION)
{
@@ -456,6 +459,7 @@ empathy_auth_factory_constructed (GObject *obj)
tp_base_client_set_handler_bypass_approval (client, FALSE);
+ /* Handle ServerTLSConnection and ServerAuthentication channels */
tp_base_client_take_handler_filter (client, tp_asv_new (
/* ChannelType */
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
@@ -479,6 +483,7 @@ empathy_auth_factory_constructed (GObject *obj)
* Claim() on the CDO so the approver won't get it, which makes
* sense. */
+ /* Observe ServerAuthentication channels */
tp_base_client_take_observer_filter (client, tp_asv_new (
/* ChannelType */
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,