aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-18 17:33:49 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-18 17:33:49 +0800
commit385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc (patch)
tree60ae6a615ce1149c00eba5bc3d0e615ac2fea7fa /libempathy
parentf1d664454fafb8f183c8721154f534f71d8423ea (diff)
downloadgsoc2013-empathy-385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc.tar
gsoc2013-empathy-385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc.tar.gz
gsoc2013-empathy-385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc.tar.bz2
gsoc2013-empathy-385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc.tar.lz
gsoc2013-empathy-385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc.tar.xz
gsoc2013-empathy-385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc.tar.zst
gsoc2013-empathy-385b1a5c6c3f0fd9d7cd5d33843466ed9e1238cc.zip
Allow to Observe a ServerAuthentication channel while handling another one
There is no reason to refuse to Observe it. (#645108)
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-auth-factory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index b005b7a7c..070bbfcff 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -213,7 +213,8 @@ common_checks (EmpathyAuthFactory *self,
if (tp_channel_get_channel_type_id (channel) ==
TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION
- && priv->sasl_handler != NULL)
+ && priv->sasl_handler != NULL &&
+ !observe)
{
g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
"Can't %s more than one ServerAuthentication channel at one time",