Mercurial > pidgin
changeset 10555:761822c6f7ca
[gaim-migrate @ 11932]
you'll see where i'm going with this eventually
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sat, 29 Jan 2005 18:36:43 +0000 |
| parents | 0ad82505bde8 |
| children | 3eff59ad7acb |
| files | src/protocols/irc/dcc_send.c src/protocols/irc/irc.c |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/irc/dcc_send.c Sat Jan 29 18:03:48 2005 +0000 +++ b/src/protocols/irc/dcc_send.c Sat Jan 29 18:36:43 2005 +0000 @@ -290,7 +290,7 @@ xfer->filename, ntohl(addr.s_addr), port, xfer->size); - irc_cmd_privmsg(xfer->account->gc->proto_data, "msg", NULL, arg); + irc_cmd_privmsg(gc->proto_data, "msg", NULL, arg); g_free(tmp); }
--- a/src/protocols/irc/irc.c Sat Jan 29 18:03:48 2005 +0000 +++ b/src/protocols/irc/irc.c Sat Jan 29 18:36:43 2005 +0000 @@ -274,7 +274,7 @@ gaim_account_get_int(account, "port", IRC_DEFAULT_PORT), irc_login_cb, gc); - if (err || !account->gc) { + if (err || !gaim_account_get_connection(account)) { gaim_connection_error(gc, _("Couldn't create socket")); return; } @@ -286,9 +286,10 @@ char hostname[256]; const char *username, *realname; struct irc_conn *irc = gc->proto_data; + const char *pass = gaim_account_get_password(gc->account); - if (gc->account->password && *gc->account->password) { - buf = irc_format(irc, "vv", "PASS", gc->account->password); + if (pass && *pass) { + buf = irc_format(irc, "vv", "PASS", pass); if (irc_send(irc, buf) < 0) { gaim_connection_error(gc, "Error sending password"); return FALSE;