diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2007-09-20 17:45:37 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2007-09-20 17:45:37 +0000 |
| commit | e3278f7a063c24f99652528730993400c37d8274 (patch) | |
| tree | 7e66842d151e8c580f83a3864f8ad441287f9f32 | |
| parent | 04379a9fe6b462e8bf5762da012f83b413877cb9 (diff) | |
| download | pidgin-e3278f7a063c24f99652528730993400c37d8274.tar.gz | |
Fix incorrect purple_proxy_connect() callback and comment out an unused function.
| -rw-r--r-- | libpurple/protocols/msn/directconn.c | 18 | ||||
| -rw-r--r-- | libpurple/protocols/msn/userlist.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c index 6b7f97d9d7..a5b4dad091 100644 --- a/libpurple/protocols/msn/directconn.c +++ b/libpurple/protocols/msn/directconn.c @@ -418,6 +418,15 @@ connect_cb(gpointer data, gint source, PurpleInputCondition cond) } } +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 @@ msn_directconn_connect(MsnDirectConn *directconn, const char *host, int port) #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 --git a/libpurple/protocols/msn/userlist.c b/libpurple/protocols/msn/userlist.c index 5fc505eedd..57e07f6ebc 100644 --- a/libpurple/protocols/msn/userlist.c +++ b/libpurple/protocols/msn/userlist.c @@ -133,6 +133,7 @@ msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id) return FALSE; } +#if 0 static const char* get_store_name(MsnUser *user) { @@ -160,6 +161,7 @@ get_store_name(MsnUser *user) return store_name; } +#endif /************************************************************************** * Server functions |