Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/sametime.c Mon Nov 24 10:43:38 2008 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Nov 24 10:59:08 2008 +0000 @@ -1445,7 +1445,7 @@ MW_PLUGIN_DEFAULT_HOST); if(purple_account_get_bool(account, MW_KEY_FORCE, FALSE) || - (! strcmp(current_host, host)) || + !host || (! strcmp(current_host, host)) || (purple_proxy_connect(NULL, account, host, port, connect_cb, pd) == NULL)) { /* if we're configured to force logins, or if we're being