Mercurial > pidgin.yaz
changeset 9381:f1fd56e83567
[gaim-migrate @ 10189]
Felipe Contreras fixed some bugs with our changes to the add_buddies
prpl thingy.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 24 Jun 2004 22:22:22 +0000 |
| parents | 8c300181122a |
| children | 37fd8a10f5fa |
| files | src/protocols/oscar/oscar.c src/server.c |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Thu Jun 24 22:09:22 2004 +0000 +++ b/src/protocols/oscar/oscar.c Thu Jun 24 22:22:22 2004 +0000 @@ -5547,11 +5547,12 @@ int n=0; while (buddies) { + GaimBuddy *buddy = buddies->data; if (n > MSG_LEN - 18) { aim_buddylist_set(od->sess, od->conn, buf); n = 0; } - n += g_snprintf(buf + n, sizeof(buf) - n, "%s&", (const char *)buddies->data); + n += g_snprintf(buf + n, sizeof(buf) - n, "%s&", buddy->name); buddies = buddies->next; } aim_buddylist_set(od->sess, od->conn, buf);
--- a/src/server.c Thu Jun 24 22:09:22 2004 +0000 +++ b/src/server.c Thu Jun 24 22:22:22 2004 +0000 @@ -413,7 +413,7 @@ /* Make a list of what the groups each buddy is in */ for (cur = buddies; cur != NULL; cur = cur->next) { GaimBlistNode *node = cur->data; - groups = g_list_append(groups, node->parent); + groups = g_list_append(groups, node->parent->parent); } if (prpl_info->add_buddies) @@ -580,7 +580,7 @@ /* Make a list of what the groups each buddy is in */ for (cur = moved_buddies; cur != NULL; cur = cur->next) { GaimBlistNode *node = cur->data; - groups = g_list_append(groups, node->parent); + groups = g_list_append(groups, node->parent->parent); } serv_remove_buddies(gc, moved_buddies, groups);