comparison src/protocols/msn/msn.c @ 10403:e5455f1dc9b6

[gaim-migrate @ 11648] This is "Yet another MSN fix" from Felipe, it actually turned into "Several MSN fixes", see bug 1088651 for the details. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 23 Dec 2004 20:13:54 +0000
parents 3e4ecbdf8d0a
children 92d4a25fd33c
comparison
equal deleted inserted replaced
10402:3d2dd0ed368d 10403:e5455f1dc9b6
1122 static void 1122 static void
1123 msn_chat_leave(GaimConnection *gc, int id) 1123 msn_chat_leave(GaimConnection *gc, int id)
1124 { 1124 {
1125 MsnSession *session; 1125 MsnSession *session;
1126 MsnSwitchBoard *swboard; 1126 MsnSwitchBoard *swboard;
1127 MsnCmdProc *cmdproc;
1128 1127
1129 session = gc->proto_data; 1128 session = gc->proto_data;
1130 1129
1131 swboard = msn_session_find_switch_with_id(session, id); 1130 swboard = msn_session_find_switch_with_id(session, id);
1132 g_return_if_fail(swboard != NULL); 1131 g_return_if_fail(swboard != NULL);
1133 1132
1134 cmdproc = swboard->servconn->cmdproc; 1133 msn_switchboard_close(swboard);
1135
1136 msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL);
1137 msn_switchboard_destroy(swboard);
1138 1134
1139 /* serv_got_chat_left(gc, id); */ 1135 /* serv_got_chat_left(gc, id); */
1140 } 1136 }
1141 1137
1142 static int 1138 static int
1238 static void 1234 static void
1239 msn_convo_closed(GaimConnection *gc, const char *who) 1235 msn_convo_closed(GaimConnection *gc, const char *who)
1240 { 1236 {
1241 MsnSession *session; 1237 MsnSession *session;
1242 MsnSwitchBoard *swboard; 1238 MsnSwitchBoard *swboard;
1243 MsnCmdProc *cmdproc;
1244 1239
1245 session = gc->proto_data; 1240 session = gc->proto_data;
1246 1241
1247 swboard = msn_session_find_swboard(session, who); 1242 swboard = msn_session_find_swboard(session, who);
1248 1243
1252 * is talking to himself. 1247 * is talking to himself.
1253 */ 1248 */
1254 if (swboard == NULL) 1249 if (swboard == NULL)
1255 return; 1250 return;
1256 1251
1257 cmdproc = swboard->servconn->cmdproc; 1252 msn_switchboard_close(swboard);
1258
1259 msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL);
1260 msn_switchboard_destroy(swboard);
1261 } 1253 }
1262 1254
1263 static void 1255 static void
1264 msn_set_buddy_icon(GaimConnection *gc, const char *filename) 1256 msn_set_buddy_icon(GaimConnection *gc, const char *filename)
1265 { 1257 {
1489 /* No we're not. */ 1481 /* No we're not. */
1490 s = g_string_sized_new(strlen(url_buffer)); 1482 s = g_string_sized_new(strlen(url_buffer));
1491 1483
1492 /* Extract their Name and put it in */ 1484 /* Extract their Name and put it in */
1493 found = gaim_markup_extract_info_field(stripped, stripped_len, s, 1485 found = gaim_markup_extract_info_field(stripped, stripped_len, s,
1494 "\tName\n", 0, "\t", 0, "Undisclosed", _("Name"), 0, NULL); 1486 "\nName\n", 0, "\t", 0, "Undisclosed", _("Name"), 0, NULL);
1495 1487
1496 if (found) 1488 if (found)
1497 has_info = TRUE; 1489 has_info = TRUE;
1498 1490
1499 /* Extract their Age and put it in */ 1491 /* Extract their Age and put it in */