diff options
| author | Jorge Villase?or <masca@cpw.pidgin.im> | 2010-08-05 22:41:22 +0000 |
|---|---|---|
| committer | Jorge Villase?or <masca@cpw.pidgin.im> | 2010-08-05 22:41:22 +0000 |
| commit | 213b27e032d808b1bf4d25f2a51405f1549a46ee (patch) | |
| tree | ae8c4bb94b7009a379d6b13d8944e246bb658fef | |
| parent | 689cc0c636922b2ade5d11e26aca8110ecffef43 (diff) | |
| download | pidgin-213b27e032d808b1bf4d25f2a51405f1549a46ee.tar.gz | |
Get rid of the ack_id field in the SlpMessage in favor of the one in the Header.
| -rw-r--r-- | libpurple/protocols/msn/slplink.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/msn/slpmsg.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/msn/slpmsg.h | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/libpurple/protocols/msn/slplink.c b/libpurple/protocols/msn/slplink.c index 0c1b93684f..b3d21673a2 100644 --- a/libpurple/protocols/msn/slplink.c +++ b/libpurple/protocols/msn/slplink.c @@ -361,7 +361,6 @@ msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) } else if (slpmsg->flags == P2P_ACK) { - slpmsg->header->ack_id = slpmsg->ack_id; slpmsg->header->ack_size = slpmsg->ack_size; slpmsg->header->ack_sub_id = slpmsg->ack_sub_id; } @@ -379,7 +378,6 @@ msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) } else if (slpmsg->flags == 0x100) { - slpmsg->header->ack_id = slpmsg->ack_id; slpmsg->header->ack_sub_id = slpmsg->ack_sub_id; slpmsg->header->ack_size = slpmsg->ack_size; } diff --git a/libpurple/protocols/msn/slpmsg.c b/libpurple/protocols/msn/slpmsg.c index 50a5883ea7..924ebac7f5 100644 --- a/libpurple/protocols/msn/slpmsg.c +++ b/libpurple/protocols/msn/slpmsg.c @@ -245,7 +245,7 @@ MsnSlpMessage *msn_slpmsg_ack_new(MsnP2PHeader *header) slpmsg->header->session_id = header->session_id; slpmsg->size = header->total_size; slpmsg->flags = P2P_ACK; - slpmsg->ack_id = header->id; + slpmsg->header->ack_id = header->id; slpmsg->ack_sub_id = header->ack_id; slpmsg->ack_size = header->total_size; slpmsg->info = "SLP ACK"; diff --git a/libpurple/protocols/msn/slpmsg.h b/libpurple/protocols/msn/slpmsg.h index eff1ae3948..24631bf4cf 100644 --- a/libpurple/protocols/msn/slpmsg.h +++ b/libpurple/protocols/msn/slpmsg.h @@ -49,7 +49,6 @@ struct _MsnSlpMessage MsnP2PFooter *footer; long id; - long ack_id; long ack_sub_id; long long ack_size; |