diff libpurple/protocols/myspace/myspace.c @ 23786:e4a4bc86c547

propagate from branch 'im.pidgin.pidgin' (head 119df2055ed7ee5143047b4d18ae81d58c2feac6) to branch 'im.pidgin.pidgin.vv' (head 06ea1dd8fde62c8644d3a64b8f8e8a16d6a14dc9)

--- a/libpurple/protocols/myspace/myspace.c	Sat Mar 15 07:39:15 2008 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Tue Mar 18 05:40:29 2008 +0000
@@ -344,10 +344,12 @@
 
 	purple_connection_update_progress(session->gc, _("Reading challenge"), 1, 4);
 
-	purple_debug_info("msim", "nc is %d bytes, decoded\n", nc_len);
+	purple_debug_info("msim", "nc is %" G_GSIZE_FORMAT
+			" bytes, decoded\n", nc_len);
 
 	if (nc_len != MSIM_AUTH_CHALLENGE_LENGTH) {
-		purple_debug_info("msim", "bad nc length: %x != 0x%x\n", nc_len, MSIM_AUTH_CHALLENGE_LENGTH);
+		purple_debug_info("msim", "bad nc length: %" G_GSIZE_MODIFIER
+				"x != 0x%x\n", nc_len, MSIM_AUTH_CHALLENGE_LENGTH);
 		purple_connection_error_reason (session->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			_("Unexpected challenge length from server"));
@@ -493,8 +495,8 @@
 
 	if (data_out_len != data_len) {
 		purple_debug_info("msim", "msim_compute_login_response: "
-				"data length mismatch: %d != %d\n",
-				data_out_len, data_len);
+				"data length mismatch: %" G_GSIZE_FORMAT " != %"
+				G_GSIZE_FORMAT "\n", data_out_len, data_len);
 	}
 
 #ifdef MSIM_DEBUG_LOGIN_CHALLENGE
@@ -764,7 +766,7 @@
 	username = msim_msg_get_string(msg, "_username");
 	g_return_val_if_fail(username != NULL, FALSE);
 
-	purple_debug_info("msim", "msim_incoming_action: action <%s> from <%d>\n", 
+	purple_debug_info("msim", "msim_incoming_action: action <%s> from <%s>\n",
 			msg_text, username);
 
 	if (g_str_equal(msg_text, "%typing%")) {
@@ -2796,7 +2798,7 @@
 	guint uid;
 
 	contact_info = (MsimMessage *)data;
-	purple_debug_info("msim_add_contact_from_server_cb", "contact_info addr=%X\n", contact_info);
+	purple_debug_info("msim_add_contact_from_server_cb", "contact_info addr=%p\n", contact_info);
 	uid = msim_msg_get_integer(contact_info, "ContactID");
 
 	if (!user_lookup_info) {
@@ -2879,7 +2881,7 @@
 
 		uid_str = g_strdup_printf("%d", uid);
 		purple_debug_info("msim_add_contact_from_server",
-				"contact_info addr=%X\n", contact_info);
+				"contact_info addr=%p\n", contact_info);
 		msim_lookup_user(session, uid_str, msim_add_contact_from_server_cb, (gpointer)msim_msg_clone(contact_info));
 		g_free(uid_str);
 	} else {