# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1190310337 0
# Node ID 7c30d5aa5e01e2028abe7ebff49f2a849dc7093f
# Parent  23a448e8ff799d54dd1b0c7ef1f93f0f338a4132
Fix incorrect purple_proxy_connect() callback and comment out an unused function.

diff -r 23a448e8ff79 -r 7c30d5aa5e01 libpurple/protocols/msn/directconn.c
--- 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
diff -r 23a448e8ff79 -r 7c30d5aa5e01 libpurple/protocols/msn/userlist.c
--- a/libpurple/protocols/msn/userlist.c	Thu Sep 20 16:32:45 2007 +0000
+++ b/libpurple/protocols/msn/userlist.c	Thu Sep 20 17:45:37 2007 +0000
@@ -133,6 +133,7 @@
 		return FALSE;
 }
 
+#if 0
 static const char*
 get_store_name(MsnUser *user)
 {
@@ -160,6 +161,7 @@
 
 	return store_name;
 }
+#endif
 
 /**************************************************************************
  * Server functions