changeset
Merge release-2.x.y
Wed, 07 May 2014 11:46:19 +0200
- author
- Tomasz Wasilczyk <twasilczyk@pidgin.im>
- date
- Wed, 07 May 2014 11:46:19 +0200
- changeset 36005
- 502d8c360580
- parent 36003
- 7939026380e1 (current diff)
- parent 36004
- 38c5d7673339 (diff)
- child 36006
- b95e81720353
Merge release-2.x.y
| pidgin/gtkblist.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/gtkblist.c Wed May 07 11:16:46 2014 +0200 +++ b/pidgin/gtkblist.c Wed May 07 11:46:19 2014 +0200 @@ -6505,15 +6505,15 @@ 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 {
