Mercurial > pidgin
diff libpurple/protocols/sametime/sametime.c @ 29448:db23767c5b3f
propagate from branch 'im.pidgin.pidgin' (head c2e5c6cc5feb732b79c07ae4dd8fa6bf02e05dd1)
to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 0dd11b78b526e2c42337a6749d942bb0a93fe958)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Tue, 25 Nov 2008 17:02:37 +0000 |
| parents | cc1e35fa774d f387ded6f5ed |
| children | 89b95d143116 |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/sametime.c Mon Nov 17 21:07:43 2008 +0000 +++ b/libpurple/protocols/sametime/sametime.c Tue Nov 25 17:02:37 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