Mercurial > pidgin

comparison libpurple/protocols/msn/slplink.c @ 30866:b682664bae30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of the ack_sub_id field in the SlpMessage in favor of the one in the Header.
author masca@cpw.pidgin.im
date Thu, 05 Aug 2010 23:09:12 +0000
parents e32332ac385c
children 6b73ff4fcc69
comparison
equal deleted inserted replaced
30865:b785e4256a66 30866:b682664bae30
360 slpmsg->header->ack_id = rand() % 0xFFFFFF00; 360 slpmsg->header->ack_id = rand() % 0xFFFFFF00;
361 } 361 }
362 else if (slpmsg->flags == P2P_ACK) 362 else if (slpmsg->flags == P2P_ACK)
363 { 363 {
364 slpmsg->header->ack_size = slpmsg->ack_size; 364 slpmsg->header->ack_size = slpmsg->ack_size;
365 slpmsg->header->ack_sub_id = slpmsg->ack_sub_id;
366 } 365 }
367 else if (slpmsg->flags == P2P_MSN_OBJ_DATA || 366 else if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
368 slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || 367 slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
369 slpmsg->flags == P2P_FILE_DATA) 368 slpmsg->flags == P2P_FILE_DATA)
370 { 369 {
376 slpmsg->footer->value = slpcall->app_id; 375 slpmsg->footer->value = slpcall->app_id;
377 slpmsg->header->ack_id = rand() % 0xFFFFFF00; 376 slpmsg->header->ack_id = rand() % 0xFFFFFF00;
378 } 377 }
379 else if (slpmsg->flags == 0x100) 378 else if (slpmsg->flags == 0x100)
380 { 379 {
381 slpmsg->header->ack_sub_id = slpmsg->ack_sub_id;
382 slpmsg->header->ack_size = slpmsg->ack_size; 380 slpmsg->header->ack_size = slpmsg->ack_size;
383 } 381 }
384 382
385 slpmsg->header->id = slpmsg->id; 383 slpmsg->header->id = slpmsg->id;
386 slpmsg->header->flags = (guint32)slpmsg->flags; 384 slpmsg->header->flags = (guint32)slpmsg->flags;