summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-12-07 16:43:34 +0000
committerDavid Laban <david.laban@collabora.co.uk>2010-12-15 14:34:32 +0000
commit04540e3ae94b618270bd3bb43b9ca6d75bf06ab8 (patch)
tree6f87ef9a157d57d803f77d50f3b8ae6e7569b15f
parent9b24bd79a3f9437ea406ef4c412ff5aae84da2ce (diff)
connection: only disconnect if we're not already disconnected
If we don't check this, tp-glib will give us a nice big fat warning. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--src/sip-connection.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 133b453..51247fa 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -903,9 +903,12 @@ _password_manager_prompt_cb (GObject *source_object,
{
DEBUG ("Auth channel failed: %s", error->message);
- tp_base_connection_disconnect_with_dbus_error (base_conn,
- tp_error_get_dbus_name (error->code), NULL,
- TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED);
+ if (base_conn->status != TP_CONNECTION_STATUS_DISCONNECTED)
+ {
+ tp_base_connection_disconnect_with_dbus_error (base_conn,
+ tp_error_get_dbus_name (error->code), NULL,
+ TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED);
+ }
g_error_free (error);
return;