From: Nathan W. <fac...@us...> - 2003-01-31 13:04:14
|
Update of /cvsroot/gaim/gaim/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv30670/plugins Modified Files: SIGNALS autorecon.c filectl.c Log Message: aim_user is dead. long live gaim_account. Index: SIGNALS =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/SIGNALS,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- SIGNALS 29 Sep 2002 04:48:39 -0000 1.33 +++ SIGNALS 31 Jan 2003 13:03:41 -0000 1.34 @@ -347,7 +347,7 @@ 'c' is the conversation being closed. event_connecting: - struct aim_user *u + struct gaim_account *u This is called when Gaim attempts to bring a user on-line. The boolean u->connecting is set to true, and connecting_count Index: autorecon.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/autorecon.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- autorecon.c 5 Jan 2003 03:02:52 -0000 1.19 +++ autorecon.c 31 Jan 2003 13:03:41 -0000 1.20 @@ -19,10 +19,10 @@ static guint tim = 0; static gboolean do_signon(gpointer data) { - struct aim_user *u = data; - if (g_slist_index(aim_users, u) < 0) + struct gaim_account *account = data; + if (g_slist_index(gaim_accounts, account) < 0) return FALSE; - serv_login(u); + serv_login(account); tim = 0; return FALSE; } @@ -30,15 +30,15 @@ static void reconnect(struct gaim_connection *gc, void *m) { if (!gc->wants_to_die) { int del; - del = (int)g_hash_table_lookup(hash, gc->user); + del = (int)g_hash_table_lookup(hash, gc->account); if (!del) del = INITIAL; else del = MAX(2 * del, MAXTIME); - tim = g_timeout_add(del, do_signon, gc->user); - g_hash_table_insert(hash, gc->user, (gpointer)del); + tim = g_timeout_add(del, do_signon, gc->account); + g_hash_table_insert(hash, gc->account, (gpointer)del); } else { - g_hash_table_remove(hash, gc->user); + g_hash_table_remove(hash, gc->account); } } Index: filectl.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/filectl.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- filectl.c 20 Jan 2003 09:09:44 -0000 1.14 +++ filectl.c 31 Jan 2003 13:03:41 -0000 1.15 @@ -38,22 +38,22 @@ debug_printf("read: %s\n", buffer); command = getarg(buffer, 0, 0); if (!strncasecmp(command, "signon", 6)) { - struct aim_user *u = NULL; - GSList *userlist = aim_users; + struct gaim_account *account = NULL; + GSList *accts = gaim_accounts; arg1 = getarg(buffer, 1, 1); if (arg1) { - while (userlist) { - struct aim_user *current = userlist->data; - if (!strcmp(current->username, arg1)) { - u = current; + while (accts) { + struct gaim_account *a = accts->data; + if (!strcmp(a->username, arg1)) { + account = a; break; } - userlist = userlist->next; + accts = accts->next; } free(arg1); } - if (u) /* username found */ - serv_login(u); + if (account) /* username found */ + serv_login(account); } else if (!strncasecmp(command, "signoff", 7)) { struct gaim_connection *gc = NULL; GSList *c = connections; |