Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/slpcall.c @ 31566:9ccbd0302bb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change MsnFileContext variables from "header" to "context". This it totally superfluous, but I don't like seeing that code if I'm looking for header stuff.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 06 Jan 2011 05:51:03 +0000
parents 3824f34c93d9
children 34da321b60f1
comparison
equal deleted inserted replaced
31565:3824f34c93d9 31566:9ccbd0302bb2
509 else if (!strcmp(euf_guid, MSN_FT_GUID)) 509 else if (!strcmp(euf_guid, MSN_FT_GUID))
510 { 510 {
511 /* File Transfer */ 511 /* File Transfer */
512 PurpleAccount *account; 512 PurpleAccount *account;
513 PurpleXfer *xfer; 513 PurpleXfer *xfer;
514 MsnFileContext *header; 514 MsnFileContext *file_context;
515 char *buf; 515 char *buf;
516 gsize bin_len; 516 gsize bin_len;
517 guint32 file_size; 517 guint32 file_size;
518 char *file_name; 518 char *file_name;
519 519
526 526
527 xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE, 527 xfer = purple_xfer_new(account, PURPLE_XFER_RECEIVE,
528 slpcall->slplink->remote_user); 528 slpcall->slplink->remote_user);
529 529
530 buf = (char *)purple_base64_decode(context, &bin_len); 530 buf = (char *)purple_base64_decode(context, &bin_len);
531 header = msn_file_context_from_wire(buf, bin_len); 531 file_context = msn_file_context_from_wire(buf, bin_len);
532 532
533 if (header != NULL) { 533 if (file_context != NULL) {
534 file_size = header->file_size; 534 file_size = file_context->file_size;
535 535
536 file_name = g_convert((const gchar *)&header->file_name, 536 file_name = g_convert((const gchar *)&file_context->file_name,
537 MAX_FILE_NAME_LEN * 2, 537 MAX_FILE_NAME_LEN * 2,
538 "UTF-8", "UTF-16LE", 538 "UTF-8", "UTF-16LE",
539 NULL, NULL, NULL); 539 NULL, NULL, NULL);
540 540
541 purple_xfer_set_filename(xfer, file_name ? file_name : ""); 541 purple_xfer_set_filename(xfer, file_name ? file_name : "");
552 slpcall->xfer = xfer; 552 slpcall->xfer = xfer;
553 purple_xfer_ref(slpcall->xfer); 553 purple_xfer_ref(slpcall->xfer);
554 554
555 xfer->data = slpcall; 555 xfer->data = slpcall;
556 556
557 if (header->preview) { 557 if (file_context->preview) {
558 purple_xfer_set_thumbnail(xfer, header->preview, 558 purple_xfer_set_thumbnail(xfer, file_context->preview,
559 header->preview_len, 559 file_context->preview_len,
560 "image/png"); 560 "image/png");
561 g_free(header->preview); 561 g_free(file_context->preview);
562 } 562 }
563 563
564 purple_xfer_request(xfer); 564 purple_xfer_request(xfer);
565 } 565 }
566 g_free(header); 566 g_free(file_context);
567 g_free(buf); 567 g_free(buf);
568 568
569 accepted = TRUE; 569 accepted = TRUE;
570 570
571 } else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) { 571 } else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {