# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1098078002 0
# Node ID 1a91e814e9d850a1b43ac16913246472158a98b9
# Parent  8490f2e292a6cb0d12eec13cb59e5c74972d7deb
[gaim-migrate @ 11145]
it looks like the rest of this was 64-bit stuff too

committer: Tailor Script <tailor@pidgin.im>

diff -r 8490f2e292a6 -r 1a91e814e9d8 src/gaim-remote.c
--- a/src/gaim-remote.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/gaim-remote.c	Mon Oct 18 05:40:02 2004 +0000
@@ -261,13 +261,13 @@
 		(strlen(opts.to) < 10000) && (strlen(opts.from) < 10000) &&
 		(strlen(opts.protocol) < 20) && (strlen(opts.message) < 10000) )
 	{
-		sprintf(temp, "%04d%s", strlen(opts.to), opts.to);
+		sprintf(temp, "%04zd%s", strlen(opts.to), opts.to);
 		gaim_remote_packet_append_string(p, temp);
-		sprintf(temp, "%04d%s", strlen(opts.from), opts.from);
+		sprintf(temp, "%04zd%s", strlen(opts.from), opts.from);
 		gaim_remote_packet_append_string(p, temp);
-		sprintf(temp, "%04d%s", strlen(opts.protocol), opts.protocol);
+		sprintf(temp, "%04zd%s", strlen(opts.protocol), opts.protocol);
 		gaim_remote_packet_append_string(p, temp);
-		sprintf(temp, "%04d%s", strlen(opts.message), opts.message);
+		sprintf(temp, "%04zd%s", strlen(opts.message), opts.message);
 		gaim_remote_packet_append_string(p, temp);
 		sprintf(temp, "%d", 0); /* quiet flag - off for now */
 		gaim_remote_packet_append_string(p, temp);
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/gtkconv.c
--- a/src/gtkconv.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/gtkconv.c	Mon Oct 18 05:40:02 2004 +0000
@@ -6268,7 +6268,7 @@
 	for (l = gaim_get_ims(); l != NULL; l = l->next) {
 		conv = (GaimConversation *)l->data;
 		gtkconv = GAIM_GTK_CONVERSATION(conv);
-		gtkconv->u.im->animate = (gboolean)value;
+		gtkconv->u.im->animate = GPOINTER_TO_INT(value);
 	}
 
 	/* Now either stop or start animation for the active conversation in each window */
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/gtkprefs.c
--- a/src/gtkprefs.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/gtkprefs.c	Mon Oct 18 05:40:02 2004 +0000
@@ -931,7 +931,7 @@
 conversation_usetabs_cb(const char *name, GaimPrefType type, gpointer value,
                           gpointer data)
 {
-	gboolean usetabs = (gboolean)value;
+	gboolean usetabs = GPOINTER_TO_INT(value);
 
 	if (usetabs)
 		gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/irc/dcc_send.c
--- a/src/protocols/irc/dcc_send.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/irc/dcc_send.c	Mon Oct 18 05:40:02 2004 +0000
@@ -286,7 +286,7 @@
 	/* Send the intended recipient the DCC request */
 	arg[0] = xfer->who;
 	inet_aton(gaim_network_get_my_ip(irc->fd), &addr);
-	arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %u\001",
+	arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %zu\001",
 	                         xfer->filename, ntohl(addr.s_addr),
 	                         port, xfer->size);
 
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/jabber/si.c
--- a/src/protocols/jabber/si.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/jabber/si.c	Mon Oct 18 05:40:02 2004 +0000
@@ -509,7 +509,7 @@
 	xmlnode_set_attrib(file, "xmlns",
 			"http://jabber.org/protocol/si/profile/file-transfer");
 	xmlnode_set_attrib(file, "name", xfer->filename);
-	g_snprintf(buf, sizeof(buf), "%d", xfer->size);
+	g_snprintf(buf, sizeof(buf), "%zu", xfer->size);
 	xmlnode_set_attrib(file, "size", buf);
 	/* maybe later we'll do hash and date attribs */
 
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/msn/directconn.c
--- a/src/protocols/msn/directconn.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/msn/directconn.c	Mon Oct 18 05:40:02 2004 +0000
@@ -52,7 +52,7 @@
 		guint16 t4;
 		guint64 t5;
 
-		sscanf (directconn->nonce, "%08X-%04hX-%04hX-%04hX-%012llX", &t1, &t2, &t3, &t4, &t5);
+		sscanf (directconn->nonce, "%08X-%04hX-%04hX-%04hX-%012" G_GINT64_MODIFIER "X", &t1, &t2, &t3, &t4, &t5);
 
 		t1 = GUINT32_TO_LE(t1);
 		t2 = GUINT16_TO_LE(t2);
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/msn/msg.c
--- a/src/protocols/msn/msg.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/msn/msg.c	Mon Oct 18 05:40:02 2004 +0000
@@ -660,13 +660,13 @@
 	{
 		g_string_append_printf(str, "Session ID: %u\r\n", msg->msnslp_header.session_id);
 		g_string_append_printf(str, "ID:         %u\r\n", msg->msnslp_header.id);
-		g_string_append_printf(str, "Offset:     %llu\r\n", msg->msnslp_header.offset);
-		g_string_append_printf(str, "Total size: %llu\r\n", msg->msnslp_header.total_size);
+		g_string_append_printf(str, "Offset:     %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.offset);
+		g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.total_size);
 		g_string_append_printf(str, "Length:     %u\r\n", msg->msnslp_header.length);
 		g_string_append_printf(str, "Flags:      0x%x\r\n", msg->msnslp_header.flags);
 		g_string_append_printf(str, "ACK ID:     %u\r\n", msg->msnslp_header.ack_id);
 		g_string_append_printf(str, "SUB ID:     %u\r\n", msg->msnslp_header.ack_sub_id);
-		g_string_append_printf(str, "ACK Size:   %lld\r\n", msg->msnslp_header.ack_size);
+		g_string_append_printf(str, "ACK Size:   %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.ack_size);
 
 #ifdef DEBUG_SLP_VERBOSE
 		if (body != NULL)
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/msn/session.c
--- a/src/protocols/msn/session.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/msn/session.c	Mon Oct 18 05:40:02 2004 +0000
@@ -233,14 +233,14 @@
 
 					group_name =
 						msn_userlist_find_group_name(local_user->userlist,
-													 (int)l->data);
+													 GPOINTER_TO_INT(l->data));
 
 					gid = msn_userlist_find_group_id(remote_user->userlist,
 													 group_name);
 
 					for (l2 = remote_user->group_ids; l2 != NULL; l2 = l2->next)
 					{
-						if ((int)l2->data == gid)
+						if (GPOINTER_TO_INT(l2->data) == gid)
 						{
 							found = TRUE;
 							break;
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/msn/slp.c
--- a/src/protocols/msn/slp.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/msn/slp.c	Mon Oct 18 05:40:02 2004 +0000
@@ -252,7 +252,7 @@
 		const char *sha1c;
 		const char *file_name;
 		char *content;
-		gsize len;
+		int len;
 		int type;
 
 		/* Send Ok */
@@ -317,7 +317,7 @@
 		GaimAccount *account;
 		GaimXfer *xfer;
 		char *bin;
-		gsize bin_len;
+		int bin_len;
 		guint32 file_size;
 		char *file_name;
 		gunichar2 *uni_name;
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/msn/slpmsg.c
--- a/src/protocols/msn/slpmsg.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/msn/slpmsg.c	Mon Oct 18 05:40:02 2004 +0000
@@ -160,7 +160,7 @@
 		"Call-ID: {%s}\r\n"
 		"Max-Forwards: 0\r\n"
 		"Content-Type: %s\r\n"
-		"Content-Length: %d\r\n"
+		"Content-Length: %" G_GSIZE_FORMAT "\r\n"
 		"\r\n",
 		header,
 		slplink->remote_user,
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/msn/switchboard.c
--- a/src/protocols/msn/switchboard.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/msn/switchboard.c	Mon Oct 18 05:40:02 2004 +0000
@@ -339,7 +339,7 @@
 	char *body_str;
 	char *body_enc;
 	char *body_final;
-	int body_len;
+	size_t body_len;
 	const char *passport;
 	const char *value;
 
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/protocols/novell/novell.c
--- a/src/protocols/novell/novell.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/protocols/novell/novell.c	Mon Oct 18 05:40:02 2004 +0000
@@ -703,7 +703,7 @@
 	GaimConnection *gc;
 	NMUserRecord *user_record = resp_data;
 	char *err;
-	gboolean allowed = (gboolean)user_data;
+	gboolean allowed = GPOINTER_TO_INT(user_data);
 	const char *display_id;
 
 	if (user == NULL)
@@ -850,7 +850,7 @@
 	GaimConnection *gc;
 	NMUserRecord *user_record = resp_data;
 	char *err;
-	gboolean allowed = (gboolean)user_data;
+	gboolean allowed = GPOINTER_TO_INT(user_data);
 	const char *dn, *display_id;
 
 	if (user == NULL)
@@ -2382,7 +2382,7 @@
 
 	user_record = nm_find_user_record(user, who);
 	if (user_record == NULL) {
-		rc = nm_send_get_details(user, who, _get_details_resp_send_invite, (gpointer)id);
+		rc = nm_send_get_details(user, who, _get_details_resp_send_invite, GINT_TO_POINTER(id));
 		_check_for_disconnect(user, rc);
 		return;
 	}
diff -r 8490f2e292a6 -r 1a91e814e9d8 src/util.c
--- a/src/util.c	Mon Oct 18 05:22:21 2004 +0000
+++ b/src/util.c	Mon Oct 18 05:40:02 2004 +0000
@@ -2365,7 +2365,7 @@
 		}
 
 		if (size_index == 0) {
-			return g_strdup_printf("%d %s", size, size_str[size_index]);
+			return g_strdup_printf("%zd %s", size, size_str[size_index]);
 		} else {
 			return g_strdup_printf("%.2f %s", size_mag, size_str[size_index]);
 		}
@@ -2622,7 +2622,7 @@
 	 * if we make sure that there is indeed a \n in our header.
 	 */
 	if (p && g_strstr_len(p, data_len - (p - data), "\n")) {
-		sscanf(p, "Content-Length: %u", &content_len);
+		sscanf(p, "Content-Length: %zu", &content_len);
 		gaim_debug_misc("parse_content_len", "parsed %u\n", content_len);
 	}