diff libpurple/protocols/mxit/filexfer.c @ 32827:4a34689eeb33 default tip

merged from im.pidgin.pidgin

--- a/libpurple/protocols/mxit/filexfer.c	Mon Sep 26 14:57:21 2011 +0900
+++ b/libpurple/protocols/mxit/filexfer.c	Sat Nov 19 14:42:54 2011 +0900
@@ -124,7 +124,7 @@
 	if ( purple_xfer_get_type( xfer ) == PURPLE_XFER_SEND ) {
 		/* we are trying to send a file to MXit */
 
-		if ( purple_xfer_get_size( xfer ) > CP_MAX_FILESIZE ) {
+		if ( purple_xfer_get_size( xfer ) > ( CP_MAX_PACKET - 1000 ) ) {	/* need to reserve some space for packet headers */
 			/* the file is too big */
 			purple_xfer_error( purple_xfer_get_type( xfer ), purple_xfer_get_account( xfer ), purple_xfer_get_remote_user( xfer ), _( "The file you are trying to send is too large!" ) );
 			purple_xfer_cancel_local( xfer );
@@ -139,7 +139,7 @@
 		 * we have just accepted a file transfer request from MXit.  send a confirmation
 		 * to the MXit server so that can send us the file
 		 */
-		mxit_send_file_accept( mx->session, mx->fileid, purple_xfer_get_size( xfer ), 0 );
+		mxit_send_file_accept( mx->session, mx->fileid, (int) purple_xfer_get_size( xfer ), 0 );
 	}
 }
 
@@ -151,7 +151,7 @@
  */
 static void mxit_xfer_start( PurpleXfer* xfer )
 {
-	size_t			filesize;
+	goffset			filesize;
 	unsigned char*	buffer;
 	int				size;
 	int				wrote;