Mercurial > pidgin.yaz
diff libfaim/aim_chat.c @ 1186:c00fc3adfd66
[gaim-migrate @ 1196]
mostly libfaim updates, and a fix for something i broke in the import dialog.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sat, 02 Dec 2000 18:41:58 +0000 |
| parents | ed8855ae6632 |
| children | 920c86b753d7 |
line wrap: on
line diff
--- a/libfaim/aim_chat.c Sat Dec 02 04:48:10 2000 +0000 +++ b/libfaim/aim_chat.c Sat Dec 02 18:41:58 2000 +0000 @@ -155,10 +155,8 @@ i+= aimutil_put16(newpacket->data+i, 2+1+strlen(roomname)+2); i+= aimutil_put16(newpacket->data+i, exchange); i+= aimutil_put8(newpacket->data+i, strlen(roomname)); - memcpy(newpacket->data+i, roomname, strlen(roomname)); - i+= strlen(roomname); - //i+= aimutil_putstr(newpacket->data+i, roomname, strlen(roomname)); - i+= aimutil_put16(newpacket->data+i, 0x0000); + i+= aimutil_putstr(newpacket->data+i, roomname, strlen(roomname)); + i+= aimutil_put16(newpacket->data+i, 0x0000); /* instance? */ /* * Chat hack. @@ -169,8 +167,8 @@ * redirect! * */ - sess->pendingjoin = (char *)malloc(strlen(roomname)+1); - strcpy(sess->pendingjoin, roomname); + sess->pendingjoin = strdup(roomname); + sess->pendingjoinexchange = exchange; newpacket->lock = 0; aim_tx_enqueue(sess, newpacket);