Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/mxit/filexfer.c	Wed Sep 04 21:05:17 2013 +0530
+++ b/libpurple/protocols/mxit/filexfer.c	Fri Sep 06 18:18:39 2013 +0530
@@ -122,12 +122,12 @@
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_xfer_init\n" );
 
-	if ( purple_xfer_get_type( xfer ) == PURPLE_XFER_SEND ) {
+	if ( purple_xfer_get_xfer_type( xfer ) == PURPLE_XFER_TYPE_SEND ) {
 		/* we are trying to send a file to MXit */
 
 		if ( purple_xfer_get_size( xfer ) > CP_MAX_FILESIZE ) {
 			/* 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_error( purple_xfer_get_xfer_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 );
 			return;
 		}
@@ -158,7 +158,7 @@
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_xfer_start\n" );
 
-	if ( purple_xfer_get_type( xfer ) == PURPLE_XFER_SEND ) {
+	if ( purple_xfer_get_xfer_type( xfer ) == PURPLE_XFER_TYPE_SEND ) {
 		/*
 		 * the user wants to send a file to one of his contacts. we need to create
 		 * a buffer and copy the file data into memory and then we can send it to
@@ -167,7 +167,7 @@
 		filesize = purple_xfer_get_bytes_remaining( xfer );
 		buffer = g_malloc( filesize );
 
-		if ( fread( buffer, filesize, 1, xfer->dest_fp ) > 0 ) {
+		if ( purple_xfer_read_file( xfer, buffer, filesize ) > 0 ) {
 			/* send data */
 			wrote = purple_xfer_write( xfer, buffer, filesize );
 			if ( wrote > 0 )
@@ -175,7 +175,7 @@
 		}
 		else {
 			/* file read error */
-			purple_xfer_error( purple_xfer_get_type( xfer ), purple_xfer_get_account( xfer ), purple_xfer_get_remote_user( xfer ), _( "Unable to access the local file" ) );
+			purple_xfer_error( purple_xfer_get_xfer_type( xfer ), purple_xfer_get_account( xfer ), purple_xfer_get_remote_user( xfer ), _( "Unable to access the local file" ) );
 			purple_xfer_cancel_local( xfer );
 		}
 
@@ -232,7 +232,7 @@
 		purple_debug_warning( MXIT_PLUGIN_ID, "mxit_xfer_write: invalid internal mxit xfer data\n" );
 		return -1;
 	}
-	else if ( purple_xfer_get_type( xfer ) != PURPLE_XFER_SEND ) {
+	else if ( purple_xfer_get_xfer_type( xfer ) != PURPLE_XFER_TYPE_SEND ) {
 		purple_debug_warning( MXIT_PLUGIN_ID, "mxit_xfer_write: wrong xfer type received\n" );
 		return -1;
 	}
@@ -308,15 +308,15 @@
 	PurpleXfer*			xfer	= NULL;
 	struct mxitxfer*	mx		= NULL;
 
-	/* (reference: "libpurple/ft.h") */
-	xfer = purple_xfer_new( session->acc, PURPLE_XFER_SEND, who );
+	/* (reference: "libpurple/xfer.h") */
+	xfer = purple_xfer_new( session->acc, PURPLE_XFER_TYPE_SEND, who );
 
 	/* create file info and attach it to the file transfer */
 	mx = g_new0( struct mxitxfer, 1 );
 	mx->session = session;
 	purple_xfer_set_protocol_data( xfer, mx );
 
-	/* configure callbacks (reference: "libpurple/ft.h") */
+	/* configure callbacks (reference: "libpurple/xfer.h") */
 	purple_xfer_set_init_fnc( xfer, mxit_xfer_init );
 	purple_xfer_set_start_fnc( xfer, mxit_xfer_start );
 	purple_xfer_set_end_fnc( xfer, mxit_xfer_end );
@@ -365,7 +365,7 @@
 
 	purple_debug_info( MXIT_PLUGIN_ID, "File Offer: file=%s, from=%s, size=%i\n", filename, username, filesize );
 
-	xfer = purple_xfer_new( session->acc, PURPLE_XFER_RECEIVE, username );
+	xfer = purple_xfer_new( session->acc, PURPLE_XFER_TYPE_RECEIVE, username );
 	if ( xfer ) {
 		/* create a new mxit xfer struct for internal use */
 		mx = g_new0( struct mxitxfer, 1 );
@@ -440,11 +440,11 @@
 	xfer = find_mxit_xfer( session, fileid );
 	if ( xfer ) {
 		/* this is the transfer we have been looking for */
-		purple_xfer_ref( xfer );
+		g_object_ref( xfer );
 		purple_xfer_start( xfer, -1, NULL, 0 );
 
-		if ( fwrite( data, datalen, 1, xfer->dest_fp ) > 0 ) {
-			purple_xfer_unref( xfer );
+		if ( purple_xfer_write_file( xfer, (const guchar *)data, datalen ) ) {
+			g_object_unref( xfer );
 			purple_xfer_set_completed( xfer, TRUE );
 			purple_xfer_end( xfer );
 
@@ -453,7 +453,7 @@
 		}
 		else {
 			/* file write error */
-			purple_xfer_error( purple_xfer_get_type( xfer ), purple_xfer_get_account( xfer ), purple_xfer_get_remote_user( xfer ), _( "Unable to save the file" ) );
+			purple_xfer_error( purple_xfer_get_xfer_type( xfer ), purple_xfer_get_account( xfer ), purple_xfer_get_remote_user( xfer ), _( "Unable to save the file" ) );
 			purple_xfer_cancel_local( xfer );
 		}
 	}