+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
+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>
Patch from Matthias Clasen (#59806)
* glib/gmessages.c (printf_string_upper_bound): Don't
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}:
Patch from Darin Adler to remove GReal* structures in
{
if (!SOURCE_DESTROYED (source) &&
source->source_funcs == funcs &&
- source->callback_data == user_data)
- break;
+ 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;
+ }
source = source->next;
}
while (source)
{
if (!SOURCE_DESTROYED (source) &&
- source->callback_data == user_data)
- break;
+ 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;
+ }
source = source->next;
}
was_in_call = source->flags & G_HOOK_FLAG_IN_CALL;
source->flags |= G_HOOK_FLAG_IN_CALL;
- UNLOCK_CONTEXT (context);
-
if (cb_funcs)
cb_funcs->get (cb_data, source, &callback, &user_data);
+ UNLOCK_CONTEXT (context);
+
need_destroy = ! dispatch (source,
callback,
user_data);