Mercurial > pidgin
comparison src/protocols/oscar/oscar.c @ 12918:a05fbd9dcc31
[gaim-migrate @ 15271]
nosnilmot noticed that I was passing the wrong variable to gaim_network_listen_range(). This reminded me to add a comment that I mean to earlier.
committer: Tailor Script <tailor@pidgin.im>
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Tue, 17 Jan 2006 19:28:45 +0000 |
parents | 8e3b85fe4a55 |
children | 248b8b39c671 |
comparison
equal
deleted
inserted
replaced
12917:a85c8c11bfab | 12918:a05fbd9dcc31 |
---|---|
1569 | 1569 |
1570 od = (OscarData *)gc->proto_data; | 1570 od = (OscarData *)gc->proto_data; |
1571 | 1571 |
1572 dim = oscar_direct_im_find(od, who); | 1572 dim = oscar_direct_im_find(od, who); |
1573 if (dim) { | 1573 if (dim) { |
1574 /* TODO: we need to somehow not do this if we're waiting | |
1575 for the gaim_network_listen_range() call to finish */ | |
1574 if (!(dim->connected)) { /* We'll free the old, unconnected dim, and start over */ | 1576 if (!(dim->connected)) { /* We'll free the old, unconnected dim, and start over */ |
1575 oscar_direct_im_disconnect(od, dim); | 1577 oscar_direct_im_disconnect(od, dim); |
1576 gaim_debug_info("oscar", | 1578 gaim_debug_info("oscar", |
1577 "Gave up on old direct IM, trying again\n"); | 1579 "Gave up on old direct IM, trying again\n"); |
1578 } else { | 1580 } else { |
1586 | 1588 |
1587 dim_l = g_new0(struct dir_im_listen, 1); | 1589 dim_l = g_new0(struct dir_im_listen, 1); |
1588 dim_l->dim = dim; | 1590 dim_l->dim = dim; |
1589 dim_l->cookie = cookie; | 1591 dim_l->cookie = cookie; |
1590 | 1592 |
1591 if(!gaim_network_listen_range(5190, 5199, SOCK_STREAM, oscar_direct_im_listen_cb, dim)) { | 1593 if(!gaim_network_listen_range(5190, 5199, SOCK_STREAM, |
1594 oscar_direct_im_listen_cb, dim_l)) { | |
1592 gaim_notify_error(gc, NULL, _("Unable to open Direct IM"), NULL); | 1595 gaim_notify_error(gc, NULL, _("Unable to open Direct IM"), NULL); |
1593 oscar_direct_im_destroy(od, dim); | 1596 oscar_direct_im_destroy(od, dim); |
1594 g_free(dim_l); | 1597 g_free(dim_l); |
1595 } | 1598 } |
1596 } | 1599 } |