comparison libpurple/protocols/oscar/oft.c @ 27947:13c774d59ac8

propagate from branch 'im.pidgin.pidgin' (head 33cc2185e6e6d5b19764d50e8b02900f782843b2) to branch 'im.pidgin.pidgin.yaz' (head efe9e22205297cc61d8f064393190b934fb3142f)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Fri, 15 May 2009 01:19:26 +0000
parents d8e6a2d592a4
children 0869bfe2738f
comparison
equal deleted inserted replaced
26959:ab298d237562 27947:13c774d59ac8
640 void 640 void
641 peer_oft_sendcb_init(PurpleXfer *xfer) 641 peer_oft_sendcb_init(PurpleXfer *xfer)
642 { 642 {
643 PeerConnection *conn; 643 PeerConnection *conn;
644 size_t size; 644 size_t size;
645 gchar *f1 = NULL, *f2 = NULL;
646 gsize dummy;
645 647
646 conn = xfer->data; 648 conn = xfer->data;
647 conn->flags |= PEER_CONNECTION_FLAG_APPROVED; 649 conn->flags |= PEER_CONNECTION_FLAG_APPROVED;
648 650
649 /* Make sure the file size can be represented in 32 bits */ 651 /* Make sure the file size can be represented in 32 bits */
677 conn->xferdata.rfcsum = 0xffff0000; 679 conn->xferdata.rfcsum = 0xffff0000;
678 conn->xferdata.recvcsum = 0xffff0000; 680 conn->xferdata.recvcsum = 0xffff0000;
679 strncpy((gchar *)conn->xferdata.idstring, "Cool FileXfer", 31); 681 strncpy((gchar *)conn->xferdata.idstring, "Cool FileXfer", 31);
680 conn->xferdata.modtime = 0; 682 conn->xferdata.modtime = 0;
681 conn->xferdata.cretime = 0; 683 conn->xferdata.cretime = 0;
682 xfer->filename = g_path_get_basename(xfer->local_filename); 684
685 /* yaz */
686 f1 = g_filename_display_basename(xfer->local_filename);
687 f2 = botch_utf(f1, strlen(f1), &dummy);
688 if(f2){
689 purple_xfer_set_filename(xfer, (char *)f2);
690 }
691 g_free(f1); f1 = NULL;
692 g_free(f2); f2 = NULL;
693
683 conn->xferdata.name_length = MAX(64, strlen(xfer->filename) + 1); 694 conn->xferdata.name_length = MAX(64, strlen(xfer->filename) + 1);
684 conn->xferdata.name = (guchar *)g_strndup(xfer->filename, conn->xferdata.name_length - 1); 695 conn->xferdata.name = (guchar *)g_strndup(xfer->filename, conn->xferdata.name_length - 1);
685 696
686 peer_oft_checksum_file(conn, xfer, 697 peer_oft_checksum_file(conn, xfer,
687 peer_oft_checksum_calculated_cb, G_MAXUINT32); 698 peer_oft_checksum_calculated_cb, G_MAXUINT32);