pidgin: ef3258e0: Gadu-Gadu: fix win32 warnings, patch fro...

[tomkiewicz at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: ef3258e09ec421ff33e34c2270937200b01b7e8c
Parent:   660528a1f130b94b365c7ff63fa9518ed89ff41c
Author:   tomkiewicz at cpw.pidgin.im
Date:     10/17/11 16:09:23
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ef3258e09ec421ff33e34c2270937200b01b7e8c

Changelog: 

Gadu-Gadu: fix win32 warnings, patch from upstream.

Changes against parent 660528a1f130b94b365c7ff63fa9518ed89ff41c

  patched  libpurple/protocols/gg/lib/dcc.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/handlers.c

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/lib/dcc.c	50362473e6df324ed3e566c5e72f2d2bc166bf94
+++ libpurple/protocols/gg/lib/dcc.c	4721abb856746ce458eeef437fdce53d36eb821f
@@ -601,7 +601,7 @@ struct gg_event *gg_dcc_watch_fd(struct 
 		struct sockaddr_in sin;
 		struct gg_dcc *c;
 		int fd, one = 1;
-		unsigned int sin_len = sizeof(sin);
+		socklen_t sin_len = sizeof(sin);
 
 		if ((fd = accept(h->fd, (struct sockaddr*) &sin, &sin_len)) == -1) {
 			gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() can't accept() new connection (errno=%d, %s)\n", errno, strerror(errno));
@@ -648,7 +648,8 @@ struct gg_event *gg_dcc_watch_fd(struct 
 		struct gg_dcc_small_packet small;
 		struct gg_dcc_big_packet big;
 		int size, tmp, res;
-		unsigned int utmp, res_size = sizeof(res);
+		unsigned int utmp;
+		socklen_t res_size = sizeof(res);
 		char buf[1024], ack[] = "UDAG";
 
 		struct gg_dcc_file_info_packet {
============================================================
--- libpurple/protocols/gg/lib/dcc7.c	1e4298363bc0b0687e3044ef89a8cddf07bcc55f
+++ libpurple/protocols/gg/lib/dcc7.c	e5218aac1396ab866a8c6f916cf3a18bbafbd170
@@ -1095,7 +1095,7 @@ struct gg_event *gg_dcc7_watch_fd(struct
 		case GG_STATE_CONNECTING:
 		{
 			int res = 0, error = 0;
-			unsigned int error_size = sizeof(error);
+			socklen_t error_size = sizeof(error);
 
 			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_CONNECTING\n");
 
@@ -1384,7 +1384,7 @@ struct gg_event *gg_dcc7_watch_fd(struct
 		case GG_STATE_CONNECTING_RELAY:
 		{
 			int res;
-			unsigned int res_size = sizeof(res);
+			socklen_t res_size = sizeof(res);
 			struct gg_dcc7_relay_req pkt;
 
 			gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_watch_fd() GG_STATE_CONNECTING_RELAY\n");
============================================================
--- libpurple/protocols/gg/lib/handlers.c	87d66880d587b734d3016a4449b5dd2f782f025e
+++ libpurple/protocols/gg/lib/handlers.c	b188c2d1262d18e6cc868eac37fbe919d9820264
@@ -92,7 +92,7 @@ static int gg_session_handle_welcome(str
 	uint8_t hash_buf[64];
 	uint32_t local_ip;
 	struct sockaddr_in sin;
-	unsigned int sin_len = sizeof(sin);
+	socklen_t sin_len = sizeof(sin);
 
 	if (len < sizeof(struct gg_welcome)) {
 		ge->type = GG_EVENT_CONN_FAILED;