# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1222709342 0
# Node ID e958c6335136e058d73679aac072cbf5e7075a51
# Parent  f50bf4ce784046a40d573d971a9f3ae1acbe9172# Parent  62c58a297fd2684c6f1be219aae05f5a3da72a32
merge of '1f1c4d53b190a6818acec7b4a5469c4a4db37759'
     and '8da5e7cc30ef10db3b7f61496928b6dccfdf34d4'

diff -r 62c58a297fd2 -r e958c6335136 libpurple/protocols/jabber/si.c
--- a/libpurple/protocols/jabber/si.c	Sun Sep 28 11:08:21 2008 +0000
+++ b/libpurple/protocols/jabber/si.c	Mon Sep 29 17:29:02 2008 +0000
@@ -1015,7 +1015,7 @@
 			jabber_si_xfer_ibb_error_cb);
 		
 		/* open the file to write to */
-		jsx->fp = g_fopen(purple_xfer_get_local_filename(xfer), "w");
+		jsx->fp = g_fopen(purple_xfer_get_local_filename(xfer), "wb");
 		
 		jsx->ibb_session = sess;
 		
@@ -1083,7 +1083,7 @@
 	purple_xfer_start(xfer, 0, NULL, 0);
 	purple_xfer_set_bytes_sent(xfer, 0);
 	purple_xfer_update_progress(xfer);
-	jsx->fp = g_fopen(purple_xfer_get_local_filename(xfer), "r");
+	jsx->fp = g_fopen(purple_xfer_get_local_filename(xfer), "rb");
 	jabber_si_xfer_ibb_send_data(sess);
 }
 
diff -r 62c58a297fd2 -r e958c6335136 libpurple/protocols/msn/session.c