/pidgin/main: 502d8c360580: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: 502d8c360580ff6de9478dd5c27c02a4f21e6108
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-07 11:46 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/502d8c360580

Description:

Merge release-2.x.y

diffstat:

 pidgin/gtkblist.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -6505,15 +6505,15 @@ static gboolean insert_node(PurpleBuddyL
 	if(!iter)
 		return FALSE;
 
+	/* XXX: it's not necessary, but let's silence a warning*/
+	memset(&parent_iter, 0, sizeof(parent_iter));
+
 	if(node->parent && !get_iter_from_node(node->parent, &parent_iter))
 		return FALSE;
 
 	if(get_iter_from_node(node, &cur))
 		curptr = &cur;
 
-	/* XXX: it's not necessary, but let's silence a warning*/
-	memset(&parent_iter, 0, sizeof(parent_iter));
-
 	if(PURPLE_IS_CONTACT(node) || PURPLE_IS_CHAT(node)) {
 		current_sort_method->func(node, list, parent_iter, curptr, iter);
 	} else {