im.pidgin.pidgin.2.2.2: 7bcb2003c8120e972e8eb784c429086d1b5e4522

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 7bcb2003c8120e972e8eb784c429086d1b5e4522
Ancestor: fc4420a53c1210a5c95a4b5faa7780ec6e6d57ae
Author: lschiere at pidgin.im
Date: 2007-10-21T04:42:20
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/plugins/log_reader.c

ChangeLog: 

applied changes from 8152fe0104bfcc5da3dda8b81badd6f63f9532b8
             through e9e74094baa29c6f5589385507221a2502b817fb

-------------- next part --------------
============================================================
--- libpurple/plugins/log_reader.c	69bf3dc2cab0901bfcf5392bc48d9e33b30bd328
+++ libpurple/plugins/log_reader.c	8cf7d851d95e9f89102af9880e325bd78e9d2fad
@@ -114,7 +114,7 @@ static GList *adium_logger_list(PurpleLo
 						continue;
 					}
 
-					rd = fread(contents, 56, 1, handle) == 0;
+					rd = fread(contents, 1, 56, handle) == 0;
 					fclose(handle);
 					contents[rd] = '\0';
 
@@ -176,7 +176,7 @@ static GList *adium_logger_list(PurpleLo
 						continue;
 					}
 
-					rd = fread(contents, 13, 1, handle);
+					rd = fread(contents, 1, 13, handle);
 					fclose(handle);
 					contents[rd] = '\0';
 
@@ -1439,7 +1439,7 @@ static char * trillian_logger_read (Purp
 
 	file = g_fopen(data->path, "rb");
 	fseek(file, data->offset, SEEK_SET);
-	data->length = fread(read, data->length, 1, file);
+	data->length = fread(read, 1, data->length, file);
 	fclose(file);
 
 	if (read[data->length-1] == '\n') {
@@ -1938,7 +1938,7 @@ static char *qip_logger_read(PurpleLog *
 	contents = g_malloc(data->length + 2);
 
 	fseek(file, data->offset, SEEK_SET);
-	data->length = fread(contents, data->length, 1, file);
+	data->length = fread(contents, 1, data->length, file);
 	fclose(file);
 
 	contents[data->length] = '\n';
@@ -2331,7 +2331,7 @@ static char *amsn_logger_read(PurpleLog 
 	g_return_val_if_fail(file != NULL, g_strdup(""));
 	
 	fseek(file, data->offset, SEEK_SET);
-	data->length = fread(contents, data->length, 1, file);
+	data->length = fread(contents, 1, data->length, file);
 	fclose(file);
 
 	contents[data->length] = '\n';