Mercurial > pidgin
comparison src/protocols/silc/ops.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 | d83f745c997b |
comparison
equal
deleted
inserted
replaced
10750:d5a00882d118 | 10751:bf5e48215158 |
---|---|
1464 | 1464 |
1465 switch (status) { | 1465 switch (status) { |
1466 case SILC_CLIENT_CONN_SUCCESS: | 1466 case SILC_CLIENT_CONN_SUCCESS: |
1467 case SILC_CLIENT_CONN_SUCCESS_RESUME: | 1467 case SILC_CLIENT_CONN_SUCCESS_RESUME: |
1468 gaim_connection_set_state(gc, GAIM_CONNECTED); | 1468 gaim_connection_set_state(gc, GAIM_CONNECTED); |
1469 serv_finish_login(gc); | |
1470 g_unlink(silcgaim_session_file(gaim_account_get_username(sg->account))); | 1469 g_unlink(silcgaim_session_file(gaim_account_get_username(sg->account))); |
1471 | 1470 |
1472 /* Send any UMODEs configured for account */ | 1471 /* Send any UMODEs configured for account */ |
1473 reject_watch = gaim_account_get_bool(sg->account, "reject-watch", FALSE); | 1472 reject_watch = gaim_account_get_bool(sg->account, "reject-watch", FALSE); |
1474 block_invites = gaim_account_get_bool(sg->account, "block-invites", FALSE); | 1473 block_invites = gaim_account_get_bool(sg->account, "block-invites", FALSE); |
1591 SilcGetAuthMeth completion, void *context) | 1590 SilcGetAuthMeth completion, void *context) |
1592 { | 1591 { |
1593 GaimConnection *gc = client->application; | 1592 GaimConnection *gc = client->application; |
1594 SilcGaim sg = gc->proto_data; | 1593 SilcGaim sg = gc->proto_data; |
1595 SilcGaimGetAuthMethod internal; | 1594 SilcGaimGetAuthMethod internal; |
1595 const char *password; | |
1596 | 1596 |
1597 /* Progress */ | 1597 /* Progress */ |
1598 if (sg->resuming) | 1598 if (sg->resuming) |
1599 gaim_connection_update_progress(gc, _("Resuming session"), 4, 5); | 1599 gaim_connection_update_progress(gc, _("Resuming session"), 4, 5); |
1600 else | 1600 else |
1604 have then return that data immediately, as it's faster way. */ | 1604 have then return that data immediately, as it's faster way. */ |
1605 if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) { | 1605 if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) { |
1606 completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context); | 1606 completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context); |
1607 return; | 1607 return; |
1608 } | 1608 } |
1609 if (gc->account->password && *gc->account->password) { | 1609 password = gaim_connection_get_password(gc); |
1610 completion(TRUE, SILC_AUTH_PASSWORD, gc->account->password, | 1610 if (password && *password) { |
1611 strlen(gc->account->password), context); | 1611 completion(TRUE, SILC_AUTH_PASSWORD, password, strlen(password), context); |
1612 return; | 1612 return; |
1613 } | 1613 } |
1614 | 1614 |
1615 /* Resolve the authentication method from server, as we may not know it. */ | 1615 /* Resolve the authentication method from server, as we may not know it. */ |
1616 internal = silc_calloc(1, sizeof(*internal)); | 1616 internal = silc_calloc(1, sizeof(*internal)); |