diff libpurple/protocols/msn/directconn.c @ 20578:7c30d5aa5e01

Fix incorrect purple_proxy_connect() callback and comment out an unused function.
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 20 Sep 2007 17:45:37 +0000
parents 723b5a2f91ce
children 02df6998b466
line wrap: on
line diff
--- a/libpurple/protocols/msn/directconn.c	Thu Sep 20 16:32:45 2007 +0000
+++ b/libpurple/protocols/msn/directconn.c	Thu Sep 20 17:45:37 2007 +0000
@@ -418,6 +418,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)
 {
@@ -437,14 +446,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);
 }
 
 void