comparison src/protocols/napster/napster.c @ 4491:3196d9044a45

[gaim-migrate @ 4766] aim_user is dead. long live gaim_account. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Fri, 31 Jan 2003 13:03:47 +0000
parents 23af9ba33ca4
children 5fcb44d771d2
comparison
equal deleted inserted replaced
4490:70b892694e0b 4491:3196d9044a45
435 /* And set up the input watcher */ 435 /* And set up the input watcher */
436 ndata->inpa = gaim_input_add(ndata->fd, GAIM_INPUT_READ, nap_login_callback, gc); 436 ndata->inpa = gaim_input_add(ndata->fd, GAIM_INPUT_READ, nap_login_callback, gc);
437 } 437 }
438 438
439 439
440 static void nap_login(struct aim_user *user) 440 static void nap_login(struct gaim_account *account)
441 { 441 {
442 struct gaim_connection *gc = new_gaim_conn(user); 442 struct gaim_connection *gc = new_gaim_conn(account);
443 gc->proto_data = g_new0(struct nap_data, 1); 443 gc->proto_data = g_new0(struct nap_data, 1);
444 444
445 if (proxy_connect(user->proto_opt[USEROPT_NAPSERVER][0] ? user->proto_opt[USEROPT_NAPSERVER] : NAP_SERVER, 445 if (proxy_connect(account->proto_opt[USEROPT_NAPSERVER][0] ?
446 user->proto_opt[USEROPT_NAPPORT][0] ? atoi(user->proto_opt[USEROPT_NAPPORT]) : NAP_PORT, 446 account->proto_opt[USEROPT_NAPSERVER] : NAP_SERVER,
447 nap_login_connect, gc) != 0) { 447 account->proto_opt[USEROPT_NAPPORT][0] ?
448 atoi(account->proto_opt[USEROPT_NAPPORT]) : NAP_PORT,
449 nap_login_connect, gc) != 0) {
448 hide_login_progress(gc, "Unable to connect"); 450 hide_login_progress(gc, "Unable to connect");
449 signoff(gc); 451 signoff(gc);
450 } 452 }
451 } 453 }
452 454