pidgin: 7993d6ca: Clean up some debugging and leave it in,...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 7993d6ca715d11d51cd1f6c5a433c7024ab4cb4f
Ancestor: 4a876e5a5a2dedc3099c3b7de3101dfa0de86482
Author: darkrain42 at pidgin.im
Date: 2009-07-21T15:05:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7993d6ca715d11d51cd1f6c5a433c7024ab4cb4f

Modified files:
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/peer.c

ChangeLog: 

Clean up some debugging and leave it in, since when it it fails, it
would cause a crash. Refs #4829.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_icbm.c	b601915b549a1b3c7743457c2bedef1f113c41bb
+++ libpurple/protocols/oscar/family_icbm.c	435af7445549bf9dff51548b7db7085ab4f66cb2
@@ -910,6 +910,9 @@ aim_im_sendch2_sendfile_requestdirect(Os
 	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
 	ByteStream hdrbs;
 
+	g_return_if_fail(bn != NULL);
+	g_return_if_fail(ip != NULL);
+
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM);
 	if (conn == NULL)
 		return;
============================================================
--- libpurple/protocols/oscar/peer.c	200727b1bbc271e215f5044d53b59d77344db2db
+++ libpurple/protocols/oscar/peer.c	e9f39411d83dba6b8c95f96d6d5bf4c1e18be634
@@ -712,10 +712,10 @@ peer_connection_establish_listener_cb(in
 	{
 		const guchar *ip_atoi = purple_network_ip_atoi(listener_ip);
 		if (ip_atoi == NULL) {
-			purple_debug_error("oscar", "Cannot send file. IP %s failed atoi.\n"
+			purple_debug_error("oscar", "Cannot send file. atoi(%s) failed.\n"
 					"Other possibly useful information: fd = %d, port = %d\n",
-			                   listener_ip ? listener_ip : "(null!)", conn->listenerfd,
-							   listener_port);
+					listener_ip ? listener_ip : "(null!)", conn->listenerfd,
+					listener_port);
 			purple_xfer_cancel_local(conn->xfer);
 			return;
 		}