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

gsocketlistener: Don’t explicitly close sockets on finalisation

Browse Source 
Instead of closing the sockets explicitly, let them close themselves
when their final reference is dropped. This makes use of
g_socket_listener_add_socket() more natural.

https://bugzilla.gnome.org/show_bug.cgi?id=732107
This commit is contained in:
Philip Withnall 2014-06-23 15:01:28 +01:00
parent 00e733315d
commit f1095de46f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gsocketlistener.c
View File

@ -82,9 +82,11 @@ g_socket_listener_finalize (GObject *object)
if (listener->priv->main_context)
g_main_context_unref (listener->priv->main_context);
if (!listener->priv->closed)
g_socket_listener_close (listener);
/* Do not explicitly close the sockets. Instead, let them close themselves if
* their final reference is dropped, but keep them open if a reference is
* held externally to the GSocketListener (which is possible if
* g_socket_listener_add_socket() was used).
*/
g_ptr_array_free (listener->priv->sockets, TRUE);
G_OBJECT_CLASS (g_socket_listener_parent_class)
@ -206,6 +208,11 @@ check_listener (GSocketListener *listener,
* useful if you're listening on multiple addresses and do
* different things depending on what address is connected to.
*
* The @socket will not be automatically closed when the @listener is finalized
* unless the listener held the final reference to the socket. Before GLib 2.42,
* the @socket was automatically closed on finalization of the @listener, even
* if references to it were held elsewhere.
*
* Returns: %TRUE on success, %FALSE on error.
*
* Since: 2.22