Mercurial > pidgin
diff src/protocols/gg/gg.c @ 10751:bf5e48215158
[gaim-migrate @ 12354]
Get rid of serv_finish_login because it's dumb.
Also fix some problems with gg and silc that I introduced yesterday.
I didn't grep for places where account->password was accessed
directly.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 27 Mar 2005 17:50:35 +0000 |
| parents | 94cc67130789 |
| children | d087e928ffd1 |
line wrap: on
line diff
--- a/src/protocols/gg/gg.c Sun Mar 27 17:39:22 2005 +0000 +++ b/src/protocols/gg/gg.c Sun Mar 27 17:50:35 2005 +0000 @@ -1,6 +1,6 @@ /* * gaim - Gadu-Gadu Protocol Plugin - * $Id: gg.c 12342 2005-03-26 23:25:18Z thekingant $ + * $Id: gg.c 12354 2005-03-27 17:50:35Z thekingant $ * * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> * @@ -178,12 +178,19 @@ static void agg_set_status(GaimAccount *account, GaimStatus *status) { - GaimConnection *gc = gaim_account_get_connection(account); - struct agg_data *gd = (struct agg_data *)gc->proto_data; - int status_num = gd->own_status; + GaimConnection *gc; + struct agg_data *gd; + int status_num; const char *status_id; char *msg = NULL; + gc = gaim_account_get_connection(account); + + if (gc == NULL) + return; + + gd = (struct agg_data *)gc->proto_data; + status_num = gd->own_status; status_id = gaim_status_get_id(status); if (!strcmp(status_id, "available")) @@ -830,7 +837,6 @@ /* Our signon is complete */ gaim_connection_set_state(gc, GAIM_CONNECTED); - serv_finish_login(gc); break; case GG_EVENT_CONN_FAILED: @@ -888,7 +894,7 @@ */ gd->sess->uin = (uin_t) strtol(account->username, (char **)NULL, 10); - gd->sess->password = g_strdup(account->password); + gd->sess->password = g_strdup(gaim_connection_get_password(gc)); gd->sess->state = GG_STATE_CONNECTING; gd->sess->check = GG_CHECK_WRITE; gd->sess->async = 1;