changeset 6935:d957f443c595

[gaim-migrate @ 7482] Another zephyr patch from Arun A. Tharuvai (aat): Zephyr users don't show up on the buddy list, and aren't locatable via the Get Info and Zlocate pop-up menu options. Attached is a fix, tested against current CVS. Zlocate was failing since pending_zloc_names stored usernames in the normalized format (username@REALMNAME), and the pending_zloc function was comparing them to names in the format (username). Zephyr users weren't showing up on the buddy list because of above, and in check_loc the buddy list wasn't being traversed. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 24 Sep 2003 03:37:22 +0000
parents 7a22c8c4db4e
children ca451b730321
files src/protocols/zephyr/zephyr.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/zephyr/zephyr.c	Wed Sep 24 02:58:21 2003 +0000
+++ b/src/protocols/zephyr/zephyr.c	Wed Sep 24 03:37:22 2003 +0000
@@ -299,7 +299,7 @@
 {
 	GList *curr;
 	for (curr = pending_zloc_names; curr != NULL; curr = curr->next) {
-		if (!g_ascii_strcasecmp(who, (char*)curr->data)) {
+		if (!g_ascii_strcasecmp(zephyr_normalize(who), (char*)curr->data)) {
 			g_free((char*)curr->data);
 			pending_zloc_names = g_list_remove(pending_zloc_names, curr->data);
 			return TRUE;
@@ -451,7 +451,7 @@
 		for(cnode = gnode->child; cnode; cnode = cnode->next) {
 			if(!GAIM_BLIST_NODE_IS_CONTACT(cnode))
 				continue;
-			for(bnode = gnode->child; bnode; bnode = bnode->next) {
+			for(bnode = cnode->child; bnode; bnode = bnode->next) {
 				GaimBuddy *b = (GaimBuddy *)bnode;
 				if(!GAIM_BLIST_NODE_IS_BUDDY(bnode))
 					continue;