Mercurial > pidgin.yaz
comparison libpurple/protocols/sametime/sametime.c @ 26043:adf153852bcf
propagate from branch 'im.pidgin.pidgin' (head df86c6f1de324e87828356aa8d5c369abd533b58)
to branch 'im.pidgin.pidgin.vv' (head 5bf87e309f2fee61842cccf4992de4866349570c)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 24 Nov 2008 10:59:08 +0000 |
| parents | c6c6dc6ccdc7 f387ded6f5ed |
| children | 25e2ab1fff1d |
comparison
equal
deleted
inserted
replaced
| 26042:bee5ab815291 | 26043:adf153852bcf |
|---|---|
| 1443 port = purple_account_get_int(account, MW_KEY_PORT, MW_PLUGIN_DEFAULT_PORT); | 1443 port = purple_account_get_int(account, MW_KEY_PORT, MW_PLUGIN_DEFAULT_PORT); |
| 1444 current_host = purple_account_get_string(account, MW_KEY_HOST, | 1444 current_host = purple_account_get_string(account, MW_KEY_HOST, |
| 1445 MW_PLUGIN_DEFAULT_HOST); | 1445 MW_PLUGIN_DEFAULT_HOST); |
| 1446 | 1446 |
| 1447 if(purple_account_get_bool(account, MW_KEY_FORCE, FALSE) || | 1447 if(purple_account_get_bool(account, MW_KEY_FORCE, FALSE) || |
| 1448 (! strcmp(current_host, host)) || | 1448 !host || (! strcmp(current_host, host)) || |
| 1449 (purple_proxy_connect(NULL, account, host, port, connect_cb, pd) == NULL)) { | 1449 (purple_proxy_connect(NULL, account, host, port, connect_cb, pd) == NULL)) { |
| 1450 | 1450 |
| 1451 /* if we're configured to force logins, or if we're being | 1451 /* if we're configured to force logins, or if we're being |
| 1452 redirected to the already configured host, or if we couldn't | 1452 redirected to the already configured host, or if we couldn't |
| 1453 connect to the new host, we'll force the login instead */ | 1453 connect to the new host, we'll force the login instead */ |