Mercurial > pidgin
changeset 20214:61e478573b14
applied changes from c18e666803193ac1b4f024b704371b20ca347246
through 53760bd543d0a40f81167717a7821f7ec2f16099
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 15:42:52 +0000 |
| parents | 5051b94ad258 |
| children | afcde99c9651 |
| files | libpurple/protocols/msn/directconn.c libpurple/protocols/msn/userlist.c |
| diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/directconn.c Fri Sep 28 15:40:58 2007 +0000 +++ b/libpurple/protocols/msn/directconn.c Fri Sep 28 15:42:52 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
--- a/libpurple/protocols/msn/userlist.c Fri Sep 28 15:40:58 2007 +0000 +++ b/libpurple/protocols/msn/userlist.c Fri Sep 28 15:42:52 2007 +0000 @@ -121,6 +121,7 @@ return TRUE; } +#if 0 static const char* get_store_name(MsnUser *user) { @@ -173,6 +174,7 @@ msn_cmdproc_send_trans(cmdproc, trans); } +#endif /************************************************************************** * Server functions