pidgin: d4229cd8: Fix up some types.

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: d4229cd8598da3fde06a0603964c1226a15c50c0
Ancestor: a0113c27348e7277d902f7e5c95e4cc02be50989
Author: qulogic at pidgin.im
Date: 2008-08-10T04:59:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d4229cd8598da3fde06a0603964c1226a15c50c0

Modified files:
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/transaction.h

ChangeLog: 

Fix up some types.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/directconn.c	5cc7006c3dc3ea40fadd9d3c48303668e7f3c71b
+++ libpurple/protocols/msn/directconn.c	0bca9a757b01ce4b827f36fbe1564a0b90baad89
@@ -162,13 +162,13 @@ create_listener(int port)
 	return fd;
 }
 
-static size_t
+static gssize
 msn_directconn_write(MsnDirectConn *directconn,
 					 const char *data, size_t len)
 {
 	char *buffer, *tmp;
 	size_t buf_size;
-	size_t ret;
+	gssize ret;
 	guint32 sent_len;
 
 	g_return_val_if_fail(directconn != NULL, 0);
@@ -274,7 +274,8 @@ read_cb(gpointer data, gint source, Purp
 {
 	MsnDirectConn* directconn;
 	char *body;
-	size_t len, body_len;
+	size_t body_len;
+	gssize len;
 
 	purple_debug_info("msn", "read_cb: %d, %d\n", source, cond);
 
============================================================
--- libpurple/protocols/msn/httpconn.c	ed9dce85a53356c829822d8da4a94094899ff4a9
+++ libpurple/protocols/msn/httpconn.c	fe14d76e6323ddd6232dbcf8e3e755ea33d82012
@@ -274,7 +274,8 @@ read_cb(gpointer data, gint source, Purp
 	MsnSession *session;
 	char buf[MSN_BUF_LEN];
 	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
+	gssize len;
+	int cur_len;
 	char *result_msg = NULL;
 	size_t result_len = 0;
 	gboolean error = FALSE;
@@ -405,7 +406,8 @@ httpconn_write_cb(gpointer data, gint so
 httpconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnHttpConn *httpconn;
-	int ret, writelen;
+	gssize ret;
+	int writelen;
 
 	httpconn = data;
 	writelen = purple_circ_buffer_get_max_read(httpconn->tx_buf);
@@ -727,7 +729,8 @@ connect_cb(gpointer data, gint source, c
 	}
 	else
 	{
-		purple_debug_error("msn", "HTTP: Connection error\n");
+		purple_debug_error("msn", "HTTP: Connection error: %s\n",
+		                   error_message ? error_message : "(null)");
 		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT);
 	}
 }
============================================================
--- libpurple/protocols/msn/servconn.c	82fd89eefcc78bf5310ca6055a7d6b718584d4f9
+++ libpurple/protocols/msn/servconn.c	aa9fa21a6e2d84dc3b0fd1bdea72217cee6a51cc
@@ -301,7 +301,8 @@ servconn_write_cb(gpointer data, gint so
 servconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnServConn *servconn = data;
-	int ret, writelen;
+	gssize ret;
+	int writelen;
 
 	writelen = purple_circ_buffer_get_max_read(servconn->tx_buf);
 
@@ -385,7 +386,8 @@ read_cb(gpointer data, gint source, Purp
 	MsnSession *session;
 	char buf[MSN_BUF_LEN];
 	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
+	gssize len;
+	int cur_len;
 
 	servconn = data;
 	session = servconn->session;
@@ -399,7 +401,7 @@ read_cb(gpointer data, gint source, Purp
 
 	} else if (len <= 0) {
 		purple_debug_error("msn", "servconn read error,"
-		                          "len: %d, errno: %d, error: %s\n",
+		                          "len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n",
 		                          len, errno, g_strerror(errno));
 		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
 
============================================================
--- libpurple/protocols/msn/transaction.h	a1a8b8255319bf6af43f1b8999b11ae6a6b3bc81
+++ libpurple/protocols/msn/transaction.h	cf301f1b8a0296102b9d509bdd3fd925eabd1aaa
@@ -45,7 +45,7 @@ struct _MsnTransaction
 	char *command;
 	char *params;
 
-	int timer;
+	guint timer;
 
 	void *data; /**< The data to be used on the different callbacks. */
 	GHashTable *callbacks;