Mercurial > pidgin
comparison libpurple/protocols/msn/contact.c @ 24512:9a3ed3b7ac4b
Check for NULL group_id before calling msn_group_new since that function will
return if you give it a NULL id. This avoids an extra debug message.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 28 Nov 2008 04:15:32 +0000 |
parents | fae699fece1f |
children | 45070d57a934 |
comparison
equal
deleted
inserted
replaced
24511:7a5f6ddd11b1 | 24512:9a3ed3b7ac4b |
---|---|
443 if ((groupId = xmlnode_get_child(group, "groupId"))) | 443 if ((groupId = xmlnode_get_child(group, "groupId"))) |
444 group_id = xmlnode_get_data(groupId); | 444 group_id = xmlnode_get_data(groupId); |
445 if ((groupInfo = xmlnode_get_child(group, "groupInfo")) && (groupname = xmlnode_get_child(groupInfo, "name"))) | 445 if ((groupInfo = xmlnode_get_child(group, "groupInfo")) && (groupname = xmlnode_get_child(groupInfo, "name"))) |
446 group_name = xmlnode_get_data(groupname); | 446 group_name = xmlnode_get_data(groupname); |
447 | 447 |
448 msn_group_new(session->userlist, group_id, group_name); | 448 if (group_id == NULL) { |
449 | |
450 if (group_id == NULL){ | |
451 /* Group of ungroupped buddies */ | 449 /* Group of ungroupped buddies */ |
452 g_free(group_name); | 450 g_free(group_name); |
453 continue; | 451 continue; |
454 } | 452 } |
455 | 453 |
454 msn_group_new(session->userlist, group_id, group_name); | |
455 | |
456 purple_debug_info("msn", "AB group_id: %s, name: %s\n", group_id, group_name ? group_name : "(null)"); | 456 purple_debug_info("msn", "AB group_id: %s, name: %s\n", group_id, group_name ? group_name : "(null)"); |
457 if ((purple_find_group(group_name)) == NULL){ | 457 if ((purple_find_group(group_name)) == NULL) { |
458 PurpleGroup *g = purple_group_new(group_name); | 458 PurpleGroup *g = purple_group_new(group_name); |
459 purple_blist_add_group(g, NULL); | 459 purple_blist_add_group(g, NULL); |
460 } | 460 } |
461 g_free(group_id); | 461 g_free(group_id); |
462 g_free(group_name); | 462 g_free(group_name); |