Mercurial > pidgin

comparison libpurple/protocols/msn/slpmsg.c @ 30855:6814678f3c63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
30854:47b6eda87723 30855:6814678f3c63
46 if (slplink) 46 if (slplink)
47 msn_slpmsg_set_slplink(slpmsg, slplink); 47 msn_slpmsg_set_slplink(slpmsg, slplink);
48 else 48 else
49 slpmsg->slplink = NULL; 49 slpmsg->slplink = NULL;
50 50
51 slpmsg->header = NULL; 51 slpmsg->header = g_new0(MsnP2PHeader, 1);
52 slpmsg->footer = NULL; 52 slpmsg->footer = NULL;
53 53
54 return slpmsg; 54 return slpmsg;
55 } 55 }
56 56
240 { 240 {
241 MsnSlpMessage *slpmsg; 241 MsnSlpMessage *slpmsg;
242 242
243 slpmsg = msn_slpmsg_new(NULL); 243 slpmsg = msn_slpmsg_new(NULL);
244 244
245 slpmsg->session_id = header->session_id; 245 slpmsg->header->session_id = header->session_id;
246 slpmsg->size = header->total_size; 246 slpmsg->size = header->total_size;
247 slpmsg->flags = P2P_ACK; 247 slpmsg->flags = P2P_ACK;
248 slpmsg->ack_id = header->id; 248 slpmsg->ack_id = header->id;
249 slpmsg->ack_sub_id = header->ack_id; 249 slpmsg->ack_sub_id = header->ack_id;
250 slpmsg->ack_size = header->total_size; 250 slpmsg->ack_size = header->total_size;
270 MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall) 270 MsnSlpMessage *msn_slpmsg_dataprep_new(MsnSlpCall *slpcall)
271 { 271 {
272 MsnSlpMessage *slpmsg; 272 MsnSlpMessage *slpmsg;
273 273
274 slpmsg = msn_slpmsg_new(NULL); 274 slpmsg = msn_slpmsg_new(NULL);
275
275 slpmsg->slpcall = slpcall; 276 slpmsg->slpcall = slpcall;
276 slpmsg->session_id = slpcall->session_id; 277 slpmsg->header->session_id = slpcall->session_id;
277 msn_slpmsg_set_body(slpmsg, NULL, 4); 278 msn_slpmsg_set_body(slpmsg, NULL, 4);
278 slpmsg->info = "SLP DATA PREP"; 279 slpmsg->info = "SLP DATA PREP";
279 280
280 return slpmsg; 281 return slpmsg;
281 282