[libsoup/gnome-3-6] SoupConnection: consistently don't disconnect on failed connection



commit 2e1f9d18ee025b3417deb7279d679cb63b347c9d
Author: Dan Winship <danw gnome org>
Date:   Mon Jan 7 15:50:36 2013 -0500

    SoupConnection: consistently don't disconnect on failed connection
    
    If soup_connection_connect_sync() failed, then SoupConnection was
    disconnecting itself, which is inconsistent with its behavior in all
    other cases.
    
    (This corresponds to the non-reverting part of c2ce0f99 'Revert
    "SoupConnection: disconnect on failed connections/tunnels' on master.)

 libsoup/soup-connection.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c
index 3572012..bef02de 100644
--- a/libsoup/soup-connection.c
+++ b/libsoup/soup-connection.c
@@ -679,15 +679,9 @@ soup_connection_connect_sync (SoupConnection *conn, GCancellable *cancellable)
 		soup_connection_set_state (conn, SOUP_CONNECTION_IN_USE);
 		priv->unused_timeout = time (NULL) + SOUP_CONNECTION_UNUSED_TIMEOUT;
 		start_idle_timer (conn);
-	} else {
-	fail:
-		if (priv->socket) {
-			soup_socket_disconnect (priv->socket);
-			g_object_unref (priv->socket);
-			priv->socket = NULL;
-		}
 	}
 
+ fail:
 	if (priv->socket && event_id)
 		g_signal_handler_disconnect (priv->socket, event_id);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]