[empathy/gnome-2-34] Allow to Observe a ServerAuthentication channel while handling another one
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-34] Allow to Observe a ServerAuthentication channel while handling another one
- Date: Fri, 18 Mar 2011 09:46:48 +0000 (UTC)
commit 2467d9a5ff47486ec71427763afd4a7e1e300b20
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Mar 18 10:33:49 2011 +0100
Allow to Observe a ServerAuthentication channel while handling another one
There is no reason to refuse to Observe it. (#645108)
libempathy/empathy-auth-factory.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index a3b01e0..edf3e2c 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -215,7 +215,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",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]