luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-24 18:08:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove pollfds from the context here, not when actually freeing the

Browse Source 
Sun Dec 10 10:47:11 2000  Owen Taylor  <otaylor@redhat.com>

	* gmain.c (g_source_destroy_internal): Remove pollfds
	from the context here, not when actually freeing the
	source.

	* gmain.c (g_source_unref_internal): Free source list
	and source, call source->source_funcs->destroy().

	* giochannel.c: Unreference io_channel properly.
This commit is contained in:
Owen Taylor
2000-12-10 16:02:48 +00:00
committed by Owen Taylor
parent 31fc683b98
commit cbd74878d1
14 changed files with 202 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gmain.c
View File

@@ -782,6 +782,7 @@ g_source_destroy_internal (GSource *source,
if (!SOURCE_DESTROYED (source))
{
GSList *tmp_list;
gpointer old_cb_data;
GSourceCallbackFuncs *old_cb_funcs;
@@ -800,6 +801,13 @@ g_source_destroy_internal (GSource *source,
LOCK_CONTEXT (context);
}
tmp_list = source->poll_fds;
while (tmp_list)
{
g_main_context_remove_poll_unlocked (context, tmp_list->data);
tmp_list = tmp_list->next;
}
g_source_unref_internal (source, context, TRUE);
}
@@ -894,7 +902,8 @@ g_source_add_poll (GSource *source,
g_return_if_fail (source != NULL);
g_return_if_fail (fd != NULL);
g_return_val_if_fail (!SOURCE_DESTROYED (source), 0);
context = source->context;
if (context)
@@ -1179,17 +1188,15 @@ g_source_unref_internal (GSource *source,
g_warning (G_STRLOC ": ref_count == 0, but source is still attached to a context!");
source->ref_count++;
}
else
{
g_source_list_remove (source, context);
tmp_list = source->poll_fds;
while (tmp_list)
{
g_main_context_remove_poll_unlocked (context, tmp_list->data);
tmp_list = tmp_list->next;
}
}
else if (context)
g_source_list_remove (source, context);
if (source->source_funcs->destroy)
source->source_funcs->destroy (source);
g_slist_free (source->poll_fds);
source->poll_fds = NULL;
g_free (source);
}
if (!have_lock && context)