Mercurial > pidgin

comparison src/protocols/yahoo/yahoochat.c @ 14108:7a205b430d19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16742] Removing the "error_cb" parameter for gaim_proxy_connect(), changing it back to how it was. As I started making changes to oscar to support canceling connection attempts, I realized that having a separate callback for errors would result in more code duplication than was needed. Originally I thought the separate callback would make things cleaner. Anyway, sorry for the noise. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 14 Aug 2006 04:43:38 +0000
parents 10e8eb6a4910
children d812efcea547
comparison
equal deleted inserted replaced
14107:c0ee28af3ca2 14108:7a205b430d19
1448 fields = g_list_append(fields, f); 1448 fields = g_list_append(fields, f);
1449 1449
1450 gaim_roomlist_set_fields(rl, fields); 1450 gaim_roomlist_set_fields(rl, fields);
1451 1451
1452 if (gaim_proxy_connect(gaim_connection_get_account(gc), yrl->host, 80, 1452 if (gaim_proxy_connect(gaim_connection_get_account(gc), yrl->host, 80,
1453 yahoo_roomlist_got_connected, NULL, yrl) == NULL) 1453 yahoo_roomlist_got_connected, yrl) == NULL)
1454 { 1454 {
1455 gaim_notify_error(gc, NULL, _("Connection problem"), _("Unable to fetch room list.")); 1455 gaim_notify_error(gc, NULL, _("Connection problem"), _("Unable to fetch room list."));
1456 yahoo_roomlist_cleanup(rl, yrl); 1456 yahoo_roomlist_cleanup(rl, yrl);
1457 return NULL; 1457 return NULL;
1458 } 1458 }
1517 1517
1518 yrl->ucat = gaim_roomlist_room_new(GAIM_ROOMLIST_ROOMTYPE_CATEGORY, _("User Rooms"), yrl->cat); 1518 yrl->ucat = gaim_roomlist_room_new(GAIM_ROOMLIST_ROOMTYPE_CATEGORY, _("User Rooms"), yrl->cat);
1519 gaim_roomlist_room_add(list, yrl->ucat); 1519 gaim_roomlist_room_add(list, yrl->ucat);
1520 1520
1521 if (gaim_proxy_connect(list->account, yrl->host, 80, 1521 if (gaim_proxy_connect(list->account, yrl->host, 80,
1522 yahoo_roomlist_got_connected, NULL, yrl) == NULL) 1522 yahoo_roomlist_got_connected, yrl) == NULL)
1523 { 1523 {
1524 gaim_notify_error(gaim_account_get_connection(list->account), 1524 gaim_notify_error(gaim_account_get_connection(list->account),
1525 NULL, _("Connection problem"), _("Unable to fetch room list.")); 1525 NULL, _("Connection problem"), _("Unable to fetch room list."));
1526 gaim_roomlist_ref(list); 1526 gaim_roomlist_ref(list);
1527 yahoo_roomlist_cleanup(list, yrl); 1527 yahoo_roomlist_cleanup(list, yrl);