[Gaim-commits] SF.net SVN: gaim: [17395] trunk/libgaim/dnsquery.c

[<the...@us...>]

Revision: 17395
          http://svn.sourceforge.net/gaim/?rev=17395&view=rev
Author:   thekingant
Date:     2006-09-28 23:15:53 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Use a GSList instead of a GQueue because g_queue_remove() wasn't added until
glib 2.4

Are we releasing beta 4 this weekend?

Modified Paths:
--------------
    trunk/libgaim/dnsquery.c

Modified: trunk/libgaim/dnsquery.c
===================================================================
--- trunk/libgaim/dnsquery.c	2006-09-29 06:04:13 UTC (rev 17394)
+++ trunk/libgaim/dnsquery.c	2006-09-29 06:15:53 UTC (rev 17395)
@@ -67,7 +67,7 @@
 };
 
 static GSList *free_dns_children = NULL;
-static GQueue *queued_requests = NULL;
+static GSList *queued_requests = NULL;
 
 static int number_of_dns_children = 0;
 
@@ -451,11 +451,12 @@
 	GaimDnsQueryData *query_data;
 	GaimDnsQueryResolverProcess *resolver;
 
-	if ((queued_requests == NULL) || (g_queue_is_empty(queued_requests)))
+	if (queued_requests == NULL)
 		/* No more DNS queries, yay! */
 		return;
 
-	query_data = g_queue_pop_head(queued_requests);
+	query_data = queued_requests->data;
+	queued_requests = g_slist_delete_link(queued_requests, queued_requests);
 
 	/*
 	 * If we have any children, attempt to have them perform the DNS
@@ -479,7 +480,7 @@
 		if (number_of_dns_children >= MAX_DNS_CHILDREN)
 		{
 			/* Apparently all our children are busy */
-			g_queue_push_head(queued_requests, query_data);
+			queued_requests = g_slist_prepend(queued_requests, query_data);
 			return;
 		}
 
@@ -597,9 +598,7 @@
 		g_return_val_if_reached(NULL);
 	}
 
-	if (!queued_requests)
-		queued_requests = g_queue_new();
-	g_queue_push_tail(queued_requests, query_data);
+	queued_requests = g_slist_append(queued_requests, query_data);
 
 	gaim_debug_info("dns", "DNS query for '%s' queued\n", query_data->hostname);
 
@@ -851,7 +850,7 @@
 gaim_dnsquery_destroy(GaimDnsQueryData *query_data)
 {
 #if defined(__unix__) || defined(__APPLE__)
-	g_queue_remove(queued_requests, query_data);
+	queued_requests = g_slist_remove(queued_requests, query_data);
 
 	if (query_data->resolver != NULL)
 		/*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.