/cpw/tomkiewicz/gg11: 8a5eea657b82: Merge from trunk

[Tomasz Wasilczyk]

Changeset: 8a5eea657b82111f3f307c1a6be6475ecdaae06b
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-09-12 14:13 +0200
Branch:	 default
URL: http://hg.pidgin.im/cpw/tomkiewicz/gg11/rev/8a5eea657b82

Description:

Merge from trunk

diffstat:

 libpurple/dnsquery.c  |   2 +-
 pidgin/gtkconv.c      |  10 +++++-----
 valgrind-suppressions |  11 +++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

diffs (58 lines):

diff --git a/libpurple/dnsquery.c b/libpurple/dnsquery.c
--- a/libpurple/dnsquery.c
+++ b/libpurple/dnsquery.c
@@ -608,7 +608,7 @@ handle_next_queued_request(void)
 		if (number_of_dns_children >= MAX_DNS_CHILDREN)
 		{
 			/* Apparently all our children are busy */
-			g_queue_push_tail(queued_requests, query_data);
+			g_queue_push_head(queued_requests, query_data);
 			return;
 		}
 
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -10114,12 +10114,12 @@ pidgin_conv_window_new()
 void
 pidgin_conv_window_destroy(PidginWindow *win)
 {
-	PidginConversation *gtkconv;
-	GList *iter;
-
 	if (win->gtkconvs) {
-		for (iter = win->gtkconvs; iter != NULL; iter = iter->next) {
-			gtkconv = iter->data;
+		GList *iter = win->gtkconvs;
+		while (iter)
+		{
+			PidginConversation *gtkconv = iter->data;
+			iter = iter->next;
 			close_conv_cb(NULL, gtkconv);
 		}
 		return;
diff --git a/valgrind-suppressions b/valgrind-suppressions
--- a/valgrind-suppressions
+++ b/valgrind-suppressions
@@ -152,16 +152,15 @@
    fun:main
 }
 {
-   libfontconfig leak 1
+   libfontconfig leaks
    Memcheck:Leak
-   fun:realloc
+   fun:*alloc
    obj:/usr/lib/libfontconfig.so.*
    ...
 }
 {
-   libfontconfig leak 2
-   Memcheck:Leak
-   fun:malloc
-   obj:/usr/lib/libfontconfig.so.*
+   webkitgtk uninitialized values
+   Memcheck:Cond
+   obj:/usr/lib/libwebkitgtk-*
    ...
 }