luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

GSocketConnection: don't close the socket if it's still reffed

Browse Source 
When disposing a GSocketConnection, don't explicitly close the
underlying GSocket. The GSocket will close itself if it gets
destroyed, and if it doesn't get destroyed, that presumably means the
app still wants to use it. Eg, this lets you use GSocketClient to
create a GSocketConnection, and then take the GSocket and destroy the
GSocketConnection.

https://bugzilla.gnome.org/show_bug.cgi?id=616855
This commit is contained in:
Dan Winship 2010-04-23 08:47:18 -04:00
parent e0ff84e688
commit a0e1b226a2
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gio/gsocketconnection.c
View File

@ -75,6 +75,8 @@ struct _GSocketConnectionPrivate
GSocket *socket;
GInputStream *input_stream;
GOutputStream *output_stream;
gboolean in_dispose;
};
static gboolean g_socket_connection_close (GIOStream *stream,
@ -217,6 +219,19 @@ g_socket_connection_constructed (GObject *object)
g_assert (connection->priv->socket != NULL);
}
static void
g_socket_connection_dispose (GObject *object)
{
GSocketConnection *connection = G_SOCKET_CONNECTION (object);
connection->priv->in_dispose = TRUE;
G_OBJECT_CLASS (g_socket_connection_parent_class)
->dispose (object);
connection->priv->in_dispose = FALSE;
}
static void
g_socket_connection_finalize (GObject *object)
{
@ -246,6 +261,7 @@ g_socket_connection_class_init (GSocketConnectionClass *klass)
gobject_class->get_property = g_socket_connection_get_property;
gobject_class->constructed = g_socket_connection_constructed;
gobject_class->finalize = g_socket_connection_finalize;
gobject_class->dispose = g_socket_connection_dispose;
stream_class->get_input_stream = g_socket_connection_get_input_stream;
stream_class->get_output_stream = g_socket_connection_get_output_stream;
@ -286,6 +302,15 @@ g_socket_connection_close (GIOStream *stream,
g_input_stream_close (connection->priv->input_stream,
cancellable, NULL);
/* Don't close the underlying socket if this is being called
* as part of dispose(); when destroying the GSocketConnection,
* we only want to close the socket if we're holding the last
* reference on it, and in that case it will close itself when
* we unref it in finalize().
*/
if (connection->priv->in_dispose)
return TRUE;
return g_socket_close (connection->priv->socket, error);
}