im.pidgin.pidgin: 417a3a6944f0dee3d065582139ee12fda243d9c3

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 417a3a6944f0dee3d065582139ee12fda243d9c3
Ancestor: 407625b32a0af3ca090b474845e8ff796b6453d3
Author: nosnilmot at pidgin.im
Date: 2007-12-02T17:29:30
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msnp9/directconn.c

ChangeLog: 

There really is nothing to see here, I'm just catching up with some changes
that were dropped while msnp9 was "out of tree", this is from
53760bd543d0a40f81167717a7821f7ec2f16099:
  Fix incorrect purple_proxy_connect() callback

-------------- next part --------------
============================================================
--- libpurple/protocols/msnp9/directconn.c	2f7f5cfe58c4cb9f306b8b2ef6009f3d9fda810b
+++ libpurple/protocols/msnp9/directconn.c	5c36766ab07279be942df0ec1ac2316475a6a200
@@ -405,6 +405,15 @@ connect_cb(gpointer data, gint source, c
 	}
 }
 
+static void
+directconn_connect_cb(gpointer data, gint source, const gchar *error_message)
+{
+	if (error_message)
+		purple_debug_error("msn", "Error making direct connection: %s\n", error_message);
+
+	connect_cb(data, source, PURPLE_INPUT_READ);
+}
+
 gboolean
 msn_directconn_connect(MsnDirectConn *directconn, const char *host, int port)
 {
@@ -424,14 +433,9 @@ msn_directconn_connect(MsnDirectConn *di
 #endif
 
 	directconn->connect_data = purple_proxy_connect(NULL, session->account,
-			host, port, connect_cb, directconn);
+			host, port, directconn_connect_cb, directconn);
 
-	if (directconn->connect_data != NULL)
-	{
-		return TRUE;
-	}
-	else
-		return FALSE;
+	return (directconn->connect_data != NULL);
 }
 
 #if 0