Mercurial > pidgin
diff libpurple/protocols/msn/slpmsg.c @ 30855:6814678f3c63
Remove session_id from SlpMsg and use the one from the header.
| author | masca@cpw.pidgin.im |
|---|---|
| date | Wed, 21 Jul 2010 19:59:38 +0000 |
| parents | 237e2c2874e6 |
| children | e32332ac385c |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slpmsg.c Mon Jul 19 21:11:32 2010 +0000 +++ b/libpurple/protocols/msn/slpmsg.c Wed Jul 21 19:59:38 2010 +0000 @@ -48,7 +48,7 @@ else slpmsg->slplink = NULL; - slpmsg->header = NULL; + slpmsg->header = g_new0(MsnP2PHeader, 1); slpmsg->footer = NULL; return slpmsg; @@ -242,7 +242,7 @@ slpmsg = msn_slpmsg_new(NULL); - slpmsg->session_id = header->session_id; + slpmsg->header->session_id = header->session_id; slpmsg->size = header->total_size; slpmsg->flags = P2P_ACK; slpmsg->ack_id = header->id; @@ -272,8 +272,9 @@ MsnSlpMessage *slpmsg; slpmsg = msn_slpmsg_new(NULL); + slpmsg->slpcall = slpcall; - slpmsg->session_id = slpcall->session_id; + slpmsg->header->session_id = slpcall->session_id; msn_slpmsg_set_body(slpmsg, NULL, 4); slpmsg->info = "SLP DATA PREP";