From: Mark D. <the...@us...> - 2005-03-26 23:26:00
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9801/src/protocols/oscar Modified Files: oscar.c Log Message: More big changes, yay. I combined gaim_connection_new and gaim_connection_connect. Earlier today I realized that it's dumb to have a GaimConnection that isn't connected. I'm about to combine gaim_connection_disconnect and gaim_connection_destroy, as well. I added a "password" field to GaimConnection. It holds the password used to login a specific GaimConnection. Now, when "remember password" is false, account->password is NEVER set. When the user tries to sign on and Gaim prompts for the password, it goes directly into the GaimConnection. Index: oscar.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v retrieving revision 1.739 retrieving revision 1.740 diff -u -d -p -r1.739 -r1.740 --- oscar.c 26 Mar 2005 20:08:42 -0000 1.739 +++ oscar.c 26 Mar 2005 23:25:16 -0000 1.740 @@ -2566,7 +2566,6 @@ static int gaim_parse_login(aim_session_ GaimConnection *gc = sess->aux_data; OscarData *od = gc->proto_data; GaimAccount *account = gaim_connection_get_account(gc); - GaimAccount *ac = gaim_connection_get_account(gc); #if 0 struct client_info_s info = {"gaim", 7, 3, 2003, "us", "en", 0x0004, 0x0000, 0x04b}; #endif @@ -2579,12 +2578,12 @@ static int gaim_parse_login(aim_session_ if (od->icq) { struct client_info_s info = CLIENTINFO_ICQ_KNOWNGOOD; - aim_send_login(sess, fr->conn, gaim_account_get_username(ac), - gaim_account_get_password(account), &info, key); + aim_send_login(sess, fr->conn, gaim_account_get_username(account), + gaim_connection_get_password(gc), &info, key); } else { struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD; - aim_send_login(sess, fr->conn, gaim_account_get_username(ac), - gaim_account_get_password(account), &info, key); + aim_send_login(sess, fr->conn, gaim_account_get_username(account), + gaim_connection_get_password(gc), &info, key); } gaim_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS); |