[empathy/gnome-2-34: 49/60] server-sasl-handler: add more debugging and only call Close in Status_Succeeded
- From: Jonny Lamb <jonnylamb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-34: 49/60] server-sasl-handler: add more debugging and only call Close in Status_Succeeded
- Date: Wed, 26 Jan 2011 14:40:55 +0000 (UTC)
commit a15a84ff439be0a22ce2fb793ceb3b6220a4d574
Author: Jonny Lamb <jonnylamb gnome org>
Date: Wed Dec 15 09:10:56 2010 +0000
server-sasl-handler: add more debugging and only call Close in Status_Succeeded
Calling Close() straight after AcceptSASL() should be fine, but it
crashed gabble on versions < 0.11.4. Waiting for State_Accepted is
fine though.
Signed-off-by: Jonny Lamb <jonnylamb gnome org>
libempathy/empathy-server-sasl-handler.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 749311d..3cfc86f 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -89,9 +89,13 @@ sasl_status_changed_cb (TpChannel *channel,
if (status == TP_SASL_STATUS_SERVER_SUCCEEDED)
{
+ DEBUG ("Calling AcceptSASL");
tp_cli_channel_interface_sasl_authentication_call_accept_sasl (
priv->channel, -1, NULL, NULL, NULL, NULL);
-
+ }
+ else if (status == TP_SASL_STATUS_SUCCEEDED)
+ {
+ DEBUG ("SASL succeeded, calling Close");
tp_cli_channel_call_close (priv->channel, -1,
NULL, NULL, NULL, NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]