# HG changeset patch # User Stu Tomlinson # Date 1196616570 0 # Node ID 960c07f6f052c53747192fd43876f6f28b212c51 # Parent d69d729ba19c0ecdb0b7f135052b41a9669e1bd1 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 diff -r d69d729ba19c -r 960c07f6f052 libpurple/protocols/msnp9/directconn.c --- a/libpurple/protocols/msnp9/directconn.c Sun Dec 02 09:25:29 2007 +0000 +++ b/libpurple/protocols/msnp9/directconn.c Sun Dec 02 17:29:30 2007 +0000 @@ -405,6 +405,15 @@ } } +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 @@ #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