Mercurial > pidgin
diff libpurple/protocols/jabber/disco.c @ 18685:c03e3fe11ea9
Fixed errors created by merge conflict resolve mistakes.
author | Andreas Monitzer <pidgin@monitzer.com> |
---|---|
date | Wed, 11 Jul 2007 23:27:12 +0000 |
parents | 5c1ed6296b56 |
children | b0733d5d7621 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c Wed Jul 11 22:27:44 2007 +0000 +++ b/libpurple/protocols/jabber/disco.c Wed Jul 11 23:27:12 2007 +0000 @@ -291,9 +291,7 @@ } /* Send initial presence; this will trigger receipt of presence for contacts on the roster */ - gpresence = purple_account_get_presence(js->gc->account); - status = purple_presence_get_active_status(gpresence); - jabber_presence_send(js->gc->account, status); + jabber_presence_send(js->gc->account, NULL); if (js->server_caps & JABBER_CAP_ADHOC) { /* The server supports ad-hoc commands, so let's request the list */