Mercurial > pidgin
diff libpurple/connection.c @ 30578:0accc8adb18a
merge of '2f6318bd834113559a405ec68cdb178f2180b680'
and '64e02b98551e11e093e4649f1516f3aceaa321e2'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 26 Sep 2010 20:16:15 +0000 |
| parents | 1c20a2115ad4 |
| children | 53f51201b39f |
line wrap: on
line diff
--- a/libpurple/connection.c Sun Sep 26 15:49:16 2010 +0000 +++ b/libpurple/connection.c Sun Sep 26 20:16:15 2010 +0000 @@ -516,7 +516,8 @@ account = data; gc = purple_account_get_connection(account); - gc->disconnect_timeout = 0; + if (gc != NULL) + gc->disconnect_timeout = 0; password = g_strdup(purple_account_get_password(account)); purple_account_disconnect(account);