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

Fix GResolver for g_simple_async_result_set_op_res_gpointer change

Browse Source 
Previously, re-setting the pointer value would cause the old
GDestroyNotify to be lost; now it causes it to be run.

http://bugzilla.gnome.org/show_bug.cgi?id=587415
This commit is contained in:
Dan Winship 2009-06-23 12:01:34 -04:00
parent d589da7e86
commit 70e8eed6ac
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gresolver.c
View File

@ -245,14 +245,12 @@ g_resolver_lookup_by_name_async (GResolver *resolver,
if (addr) if (addr)
{ {
GSimpleAsyncResult *simple; GSimpleAsyncResult *simple;
GList *addrs;
simple = g_simple_async_result_new (G_OBJECT (resolver), simple = g_simple_async_result_new (G_OBJECT (resolver),
callback, user_data, callback, user_data,
g_resolver_lookup_by_name_async); g_resolver_lookup_by_name_async);
addrs = g_list_append (NULL, addr); g_simple_async_result_set_op_res_gpointer (simple, addr, g_object_unref);
g_simple_async_result_set_op_res_gpointer (simple, addrs, (GDestroyNotify)g_resolver_free_addresses);
g_simple_async_result_complete_in_idle (simple); g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple); g_object_unref (simple);
return; return;
@ -302,11 +300,10 @@ g_resolver_lookup_by_name_finish (GResolver *resolver,
/* Handle the stringified-IP-addr case */ /* Handle the stringified-IP-addr case */
if (g_simple_async_result_get_source_tag (simple) == g_resolver_lookup_by_name_async) if (g_simple_async_result_get_source_tag (simple) == g_resolver_lookup_by_name_async)
{ {
GList *addrs; GInetAddress *addr;
addrs = g_simple_async_result_get_op_res_gpointer (simple); addr = g_simple_async_result_get_op_res_gpointer (simple);
g_simple_async_result_set_op_res_gpointer (simple, NULL, NULL); return g_list_append (NULL, g_object_ref (addr));
return addrs;
} }
} }