summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2010-12-15 09:10:56 +0000
committerJonny Lamb <jonnylamb@gnome.org>2010-12-15 09:11:47 +0000
commite63548aeb4d170976beea77c299a3575287ca048 (patch)
treeceb12133ac994efd1bd735d7f92286289063a1e6
parent2ec9b6e89141999f919f8a3bd4a44fd8abad86ff (diff)
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>
-rw-r--r--libempathy/empathy-server-sasl-handler.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 749311d4b..3cfc86fa8 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);
}