luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 04:28:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of user data when locating sources. (#60414, Katsuhiro Okuno)

Browse Source 
Wed Sep 19 16:35:22 2001  Owen Taylor  <otaylor@redhat.com>

	* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
	Fix handling of user data when locating sources.
	(#60414, Katsuhiro Okuno)
This commit is contained in:
Owen Taylor 2001-09-19 20:39:21 +00:00 committed by Owen Taylor
parent 5c12c0acf1
commit ffe592544f
9 changed files with 78 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

8
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Wed Sep 19 16:35:22 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.c (g_main_context_find_source_by[_funcs]_user_data):
Fix handling of user data when locating sources.
(#60414, Katsuhiro Okuno)
Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com> Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
Patch from Matthias Clasen (#59806) Patch from Matthias Clasen (#59806)
@ -17,7 +23,7 @@ Wed Sep 19 14:17:31 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmessages.c (printf_string_upper_bound): Don't * glib/gmessages.c (printf_string_upper_bound): Don't
segfault when warning about positional parameters. segfault when warning about positional parameters.
Wed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com> Wzed Sep 19 14:05:27 2001 Owen Taylor <otaylor@redhat.com>
* glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}: * glib/{gcache.c,gmem.c,grel.c,gstring.c,gtimer.c,gtree}:
Patch from Darin Adler to remove GReal* structures in Patch from Darin Adler to remove GReal* structures in

24
glib/gmain.c
View File

@ -1381,8 +1381,16 @@ g_main_context_find_source_by_funcs_user_data (GMainContext *context,
{ {
if (!SOURCE_DESTROYED (source) && if (!SOURCE_DESTROYED (source) &&
source->source_funcs == funcs && source->source_funcs == funcs &&
source->callback_data == user_data) source->callback_funcs)
{
GSourceFunc callback;
gpointer callback_data;
source->callback_funcs->get (source->callback_data, source, &callback, &callback_data);
if (callback_data == user_data)
break; break;
}
source = source->next; source = source->next;
} }
@ -1417,8 +1425,16 @@ g_main_context_find_source_by_user_data (GMainContext *context,
while (source) while (source)
{ {
if (!SOURCE_DESTROYED (source) && if (!SOURCE_DESTROYED (source) &&
source->callback_data == user_data) source->callback_funcs)
{
GSourceFunc callback;
gpointer callback_data = NULL;
source->callback_funcs->get (source->callback_data, source, &callback, &callback_data);
if (callback_data == user_data)
break; break;
}
source = source->next; source = source->next;
} }
@ -1592,11 +1608,11 @@ g_main_dispatch (GMainContext *context)
was_in_call = source->flags & G_HOOK_FLAG_IN_CALL; was_in_call = source->flags & G_HOOK_FLAG_IN_CALL;
source->flags |= G_HOOK_FLAG_IN_CALL; source->flags |= G_HOOK_FLAG_IN_CALL;
UNLOCK_CONTEXT (context);
if (cb_funcs) if (cb_funcs)
cb_funcs->get (cb_data, source, &callback, &user_data); cb_funcs->get (cb_data, source, &callback, &user_data);
UNLOCK_CONTEXT (context);
need_destroy = ! dispatch (source, need_destroy = ! dispatch (source,
callback, callback,
user_data); user_data);