Mercurial > pidgin
diff src/protocols/msn/session.c @ 8583:fc27237783ee
[gaim-migrate @ 9333]
Added Felipe Contreras's patch to reorganize and clean up the MSN
protocol plugin. Thanks, and once again, apologies for the what must have
seemed a never-ending delay.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Mon, 05 Apr 2004 07:11:24 +0000 |
parents | 467b01d02f9c |
children | 060171053a32 |
line wrap: on
line diff
--- a/src/protocols/msn/session.c Mon Apr 05 06:52:02 2004 +0000 +++ b/src/protocols/msn/session.c Mon Apr 05 07:11:24 2004 +0000 @@ -21,7 +21,6 @@ */ #include "msn.h" #include "session.h" -#include "dispatch.h" #include "notification.h" MsnSession * @@ -108,20 +107,24 @@ if (session->http_method) { - session->notification_conn = - msn_notification_new(session, "gateway.messenger.hotmail.com", 80); + session->notification_conn = msn_notification_new(session); - if (msn_servconn_connect(session->notification_conn)) + if (msn_notification_connect(session->notification_conn, + "gateway.messenger.hotmail.com", 80)) + { return TRUE; + } } else { - session->dispatch_conn = msn_dispatch_new(session, - session->dispatch_server, - session->dispatch_port); + session->notification_conn = msn_notification_new(session); - if (msn_servconn_connect(session->dispatch_conn)) + if (msn_notification_connect(session->notification_conn, + session->dispatch_server, + session->dispatch_port)) + { return TRUE; + } } return FALSE; @@ -133,11 +136,6 @@ g_return_if_fail(session != NULL); g_return_if_fail(session->connected); - if (session->dispatch_conn != NULL) { - msn_servconn_destroy(session->dispatch_conn); - session->dispatch_conn = NULL; - } - while (session->switches != NULL) { MsnSwitchBoard *board = (MsnSwitchBoard *)session->switches->data;