[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.169,1.170

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9801/src/protocols/toc

Modified Files:
	toc.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: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -p -r1.169 -r1.170
--- toc.c	7 Mar 2005 02:19:08 -0000	1.169
+++ toc.c	26 Mar 2005 23:25:17 -0000	1.170
@@ -602,9 +602,9 @@ static void toc_callback(gpointer data, 
 				   "Client sends TOC \"toc_signon\" message\n");
 		/* i hate icq. */
 		if (username[0] >= '0' && username[0] <= '9')
-			password = g_strndup(gaim_account_get_password(account), 8);
+			password = g_strndup(gaim_connection_get_password(connection), 8);
 		else
-			password = g_strdup(gaim_account_get_password(account));
+			password = g_strdup(gaim_connection_get_password(connection));
 		g_snprintf(snd, sizeof snd, "toc_signon %s %d  %s %s %s \"%s\"",
 			   AUTH_HOST, AUTH_PORT, gaim_normalize(account, username),
 			   roast_password(password), LANGUAGE, REVISION);
@@ -684,7 +684,7 @@ static void toc_callback(gpointer data, 
 			g_snprintf(snd, sizeof snd, "toc_signon %s %d %s %s %s \"%s\"",
 				   AUTH_HOST, AUTH_PORT,
 				   gaim_normalize(account, gaim_account_get_username(account)),
-				   roast_password(gaim_account_get_password(account)),
+				   roast_password(gaim_connection_get_password(connection)),
 				   LANGUAGE, REVISION);
 			if (sflap_send(gc, snd, -1, TYPE_DATA) < 0) {
 				gaim_connection_error(gc, _("Disconnected."));