From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Wed, 2 Sep 2009 16:48:09 +0000 (+0100)
Subject: Fix GNetworkAddress skipping addresses when enumerating
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=866731776651e04178a6cc1e78d244384a890d1a;p=dana%2Fcg-glib.git

Fix GNetworkAddress skipping addresses when enumerating

g_network_address_address_enumerator_next_finish takes the first item of the
address list and moves the pointer to the next one, so we shouldn't do the same
in g_network_address_address_enumerator_next_async function

Fixes bug #593941
---

diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c
index 09df3dbf..16af7f5a 100644
--- a/gio/gnetworkaddress.c
+++ b/gio/gnetworkaddress.c
@@ -543,7 +543,6 @@ g_network_address_address_enumerator_next_async (GSocketAddressEnumerator  *enum
   GNetworkAddressAddressEnumerator *addr_enum =
     G_NETWORK_ADDRESS_ADDRESS_ENUMERATOR (enumerator);
   GSimpleAsyncResult *simple;
-  GSocketAddress *sockaddr;
 
   simple = g_simple_async_result_new (G_OBJECT (enumerator),
                                       callback, user_data,
@@ -561,10 +560,6 @@ g_network_address_address_enumerator_next_async (GSocketAddressEnumerator  *enum
     }
   else
     {
-      sockaddr = g_network_address_address_enumerator_next (enumerator, NULL, NULL);
-      if (sockaddr)
-        g_simple_async_result_set_op_res_gpointer (simple, sockaddr, g_object_unref);
-
       g_simple_async_result_complete_in_idle (simple);
       g_object_unref (simple);
     }