Mercurial > pidgin
diff src/server.c @ 515:b33ed0a7f49b
[gaim-migrate @ 525]
DirectIM. fun. bleh.
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Fri, 21 Jul 2000 06:01:35 +0000 |
parents | eaddaa0dbbcb |
children | ee4e18868584 |
line wrap: on
line diff
--- a/src/server.c Fri Jul 21 01:21:38 2000 +0000 +++ b/src/server.c Fri Jul 21 06:01:35 2000 +0000 @@ -822,7 +822,7 @@ } #endif b->uc = type; - b->caps = caps; + if (caps) b->caps = caps; b->signon = signon; @@ -1104,13 +1104,17 @@ } void serv_do_imimage(GtkWidget *w, char *name) { + struct conversation *cnv = find_conversation(name); + if (!cnv) cnv = new_conversation(name); + if (!USE_OSCAR) { + /* FIXME */ } else { oscar_do_directim(name); } } -void serv_got_imimage(char *name, char *cookie, char *ip, struct aim_conn_t *conn) +void serv_got_imimage(char *name, char *cookie, char *ip, struct aim_conn_t *conn, int watcher) { if (!USE_OSCAR) { /* FIXME */ @@ -1119,5 +1123,6 @@ if (!cnv) cnv = new_conversation(name); cnv->is_direct = 1; cnv->conn = conn; + cnv->watcher = watcher; } }