Mercurial > pidgin.yaz
diff src/oscar.c @ 516:ee4e18868584
[gaim-migrate @ 526]
Make it obvious that it happens.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 21 Jul 2000 18:08:00 +0000 |
| parents | b33ed0a7f49b |
| children | dd4d415dbe52 |
line wrap: on
line diff
--- a/src/oscar.c Fri Jul 21 06:01:35 2000 +0000 +++ b/src/oscar.c Fri Jul 21 18:08:00 2000 +0000 @@ -122,9 +122,7 @@ struct conversation *cnv = find_conversation(direct); debug_print("connection error for directim\n"); if (cnv) { - cnv->is_direct = 0; - cnv->conn = NULL; - gdk_input_remove(cnv->watcher); + make_direct(cnv, FALSE, NULL, 0); } } aim_conn_kill(gaim_sess, &conn); @@ -968,8 +966,7 @@ void oscar_do_directim(char *name) { struct aim_conn_t *newconn = aim_directim_initiate(gaim_sess, gaim_conn, NULL, name); struct conversation *cnv = find_conversation(name); /* this will never be null because it just got set up */ - cnv->is_direct = TRUE; - cnv->conn = newconn; - cnv->watcher = gdk_input_add(newconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, oscar_callback, newconn); + int watcher = gdk_input_add(newconn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION, oscar_callback, newconn); + make_direct(cnv, TRUE, newconn, watcher); aim_conn_addhandler(gaim_sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE, gaim_directim_initiate, 0); }