comparison src/protocols/msn/session.c @ 10463:9bed28273ec7

[gaim-migrate @ 11737] Felipe Contreras fixed the MSN HTTP Method. Yay! Thanks Felipe. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 31 Dec 2004 16:34:22 +0000
parents 2e01c503aa4f
children bcfea6c3d5c9
comparison
equal deleted inserted replaced
10462:f7b32dd67bdf 10463:9bed28273ec7
111 g_return_val_if_fail(session != NULL, FALSE); 111 g_return_val_if_fail(session != NULL, FALSE);
112 g_return_val_if_fail(!session->connected, TRUE); 112 g_return_val_if_fail(!session->connected, TRUE);
113 113
114 session->connected = TRUE; 114 session->connected = TRUE;
115 115
116 if (session->notification == NULL)
117 {
118 gaim_debug_error("msn", "This shouldn't happen\n");
119 g_return_val_if_reached(FALSE);
120 }
121
116 if (msn_notification_connect(session->notification, 122 if (msn_notification_connect(session->notification,
117 session->dispatch_host, 123 session->dispatch_host,
118 session->dispatch_port)) 124 session->dispatch_port))
119 { 125 {
120 return TRUE; 126 return TRUE;
128 { 134 {
129 g_return_if_fail(session != NULL); 135 g_return_if_fail(session != NULL);
130 g_return_if_fail(session->connected); 136 g_return_if_fail(session->connected);
131 137
132 while (session->switches != NULL) 138 while (session->switches != NULL)
133 msn_switchboard_destroy(session->switches->data); 139 msn_switchboard_close(session->switches->data);
134 140
135 if (session->notification != NULL) 141 if (session->notification != NULL)
136 msn_notification_disconnect(session->notification); 142 msn_notification_close(session->notification);
143
144 session->connected = FALSE;
137 } 145 }
138 146
139 /* TODO: This must go away when conversation is redesigned */ 147 /* TODO: This must go away when conversation is redesigned */
140 MsnSwitchBoard * 148 MsnSwitchBoard *
141 msn_session_find_swboard(MsnSession *session, const char *username) 149 msn_session_find_swboard(MsnSession *session, const char *username)