Changeset 4aa0f6b for protocols/oscar/oscar.c
- Timestamp:
- 2010-06-07T14:31:07Z (14 years ago)
- Branches:
- master
- Children:
- 56699f0
- Parents:
- 0d9d53e (diff), 1fdb0a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/oscar/oscar.c
r0d9d53e r4aa0f6b 288 288 odata = (struct oscar_data *)ic->proto_data; 289 289 290 if (condition & GAIM_INPUT_READ) {290 if (condition & B_EV_IO_READ) { 291 291 if (aim_get_command(odata->sess, conn) >= 0) { 292 292 aim_rxdispatch(odata->sess); … … 360 360 361 361 aim_conn_completeconnect(sess, conn); 362 ic->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,362 ic->inpa = b_input_add(conn->fd, B_EV_IO_READ, 363 363 oscar_callback, conn); 364 364 … … 372 372 if (isdigit(acc->user[0])) { 373 373 set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc); 374 set_add(&acc->set, "old_icq_auth", "false", set_eval_bool, acc); 374 375 } 375 376 … … 490 491 491 492 aim_conn_completeconnect(sess, bosconn); 492 ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,493 ic->inpa = b_input_add(bosconn->fd, B_EV_IO_READ, 493 494 oscar_callback, bosconn); 494 495 imcb_log(ic, _("Connection established, cookie sent")); … … 706 707 707 708 aim_conn_completeconnect(sess, tstconn); 708 odata->cnpa = b_input_add(tstconn->fd, GAIM_INPUT_READ,709 odata->cnpa = b_input_add(tstconn->fd, B_EV_IO_READ, 709 710 oscar_callback, tstconn); 710 711 … … 734 735 735 736 aim_conn_completeconnect(sess, tstconn); 736 odata->paspa = b_input_add(tstconn->fd, GAIM_INPUT_READ,737 odata->paspa = b_input_add(tstconn->fd, B_EV_IO_READ, 737 738 oscar_callback, tstconn); 738 739 … … 770 771 aim_conn_completeconnect(sess, ccon->conn); 771 772 ccon->inpa = b_input_add(tstconn->fd, 772 GAIM_INPUT_READ,773 B_EV_IO_READ, 773 774 oscar_callback, tstconn); 774 775 odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);
Note: See TracChangeset
for help on using the changeset viewer.